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 | |
| 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.
| -rw-r--r-- | roles/openshift_hosted/README.md | 1 | ||||
| -rw-r--r-- | roles/openshift_hosted/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_hosted/tasks/registry.yml | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_hosted/README.md b/roles/openshift_hosted/README.md index 29ae58556..d6f6e3e09 100644 --- a/roles/openshift_hosted/README.md +++ b/roles/openshift_hosted/README.md @@ -27,6 +27,7 @@ From this role: | openshift_hosted_registry_replicas | Number of nodes matching selector | The number of replicas to configure. | | openshift_hosted_registry_selector | region=infra | Node selector used when creating registry. The OpenShift registry will only be deployed to nodes matching this selector. | | openshift_hosted_registry_cert_expire_days | `730` (2 years) | Validity of the certificates in days. Works only with OpenShift version 1.5 (3.5) and later. | +| openshift_hosted_registry_clusterip | None | Cluster IP for registry service | If you specify `openshift_hosted_registry_kind=glusterfs`, the following variables also control configuration behavior: diff --git a/roles/openshift_hosted/defaults/main.yml b/roles/openshift_hosted/defaults/main.yml index 589ad3f51..2af42fba4 100644 --- a/roles/openshift_hosted/defaults/main.yml +++ b/roles/openshift_hosted/defaults/main.yml @@ -80,6 +80,7 @@ r_openshift_hosted_registry_os_firewall_allow: openshift_hosted_registry_serviceaccount: registry openshift_hosted_registry_volumes: [] openshift_hosted_registry_env_vars: {} +openshift_hosted_registry_clusterip: null # These edits are being specified only to prevent 'changed' on rerun openshift_hosted_registry_edits: diff --git a/roles/openshift_hosted/tasks/registry.yml b/roles/openshift_hosted/tasks/registry.yml index f1aa9c5a8..eaaac9da2 100644 --- a/roles/openshift_hosted/tasks/registry.yml +++ b/roles/openshift_hosted/tasks/registry.yml @@ -89,6 +89,7 @@ docker-registry: default session_affinity: ClientIP service_type: ClusterIP + clusterip: '{{ openshift_hosted_registry_clusterip | default(omit) }}' - include: secure.yml static: no |