diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-24 13:23:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 13:23:02 -0800 |
| commit | 0b57e113dbf16b5ac6f01859c9c4ab2aee594f87 (patch) | |
| tree | 485489ed97077f98f04a644bb955864e7e2cd3d8 | |
| parent | 54ee60a3e9d162aedd28af7396975dc7fbaef662 (diff) | |
| parent | 0da4565f55faeb436b5a4634a1f57d18ffb7e0c4 (diff) | |
| download | openshift-0b57e113dbf16b5ac6f01859c9c4ab2aee594f87.tar.gz openshift-0b57e113dbf16b5ac6f01859c9c4ab2aee594f87.tar.bz2 openshift-0b57e113dbf16b5ac6f01859c9c4ab2aee594f87.tar.xz openshift-0b57e113dbf16b5ac6f01859c9c4ab2aee594f87.zip | |
Merge pull request #6830 from bparees/registry_addr
Automatic merge from submit-queue.
use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the registry hostname
| -rw-r--r-- | roles/openshift_hosted/tasks/registry.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_hosted/tasks/registry.yml b/roles/openshift_hosted/tasks/registry.yml index 22294e3d4..bc4d81eb7 100644 --- a/roles/openshift_hosted/tasks/registry.yml +++ b/roles/openshift_hosted/tasks/registry.yml @@ -43,7 +43,7 @@ - name: Update registry environment variables when pushing via dns set_fact: - openshift_hosted_registry_env_vars: "{{ openshift_hosted_registry_env_vars | combine({'OPENSHIFT_DEFAULT_REGISTRY':'docker-registry.default.svc:5000'}) }}" + openshift_hosted_registry_env_vars: "{{ openshift_hosted_registry_env_vars | combine({'REGISTRY_OPENSHIFT_SERVER_ADDR':'docker-registry.default.svc:5000'}) }}" when: openshift_push_via_dns | bool - name: Update registry proxy settings for dc/docker-registry |