diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-09 13:58:26 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-09 13:58:26 -0800 |
commit | c1045e5e433c0b6469040235e7bd151a9e767f9f (patch) | |
tree | ed0bf6f744d381a7aec4dc50d0670a92607456a0 /roles/calico/templates/10-calico.conf.j2 | |
parent | 7900f45d2d8ef566cf3f330a33364dd217a93c1d (diff) | |
parent | 4abb7381bdf439dfc1ab371be231f856620d7e19 (diff) | |
download | openshift-c1045e5e433c0b6469040235e7bd151a9e767f9f.tar.gz openshift-c1045e5e433c0b6469040235e7bd151a9e767f9f.tar.bz2 openshift-c1045e5e433c0b6469040235e7bd151a9e767f9f.tar.xz openshift-c1045e5e433c0b6469040235e7bd151a9e767f9f.zip |
Merge pull request #5571 from vshn/registryip1
Automatic merge from submit-queue.
Allow cluster IP for docker-registry service to be set
For historical reasons a small set of programs in our environments rely
on the cluster-internal Docker registry having the IP address
"172.30.1.1". So far we always had to patch in that address manually.
Adding a variable on the "openshift_hosted" role allows the IP address
to be set correctly when a cluster is installed.
Diffstat (limited to 'roles/calico/templates/10-calico.conf.j2')
0 files changed, 0 insertions, 0 deletions