diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-27 23:36:09 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-27 23:36:09 -0800 |
| commit | 312692222f11c19df680867b4e497947e343d017 (patch) | |
| tree | 42d5db65690daf196f5e9aec1b5a44ae81a5dcb7 | |
| parent | 97888898a8de6dc37510f384b8eab351b11c9df3 (diff) | |
| parent | b587264262b21fb0d63ac3a03aeb770d50e0082a (diff) | |
| download | openshift-312692222f11c19df680867b4e497947e343d017.tar.gz openshift-312692222f11c19df680867b4e497947e343d017.tar.bz2 openshift-312692222f11c19df680867b4e497947e343d017.tar.xz openshift-312692222f11c19df680867b4e497947e343d017.zip | |
Merge pull request #6913 from openshift/revert-6830-registry_addr
Automatic merge from submit-queue.
Revert "use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the registry hostname"
Reverts openshift/openshift-ansible#6830
@dmage @legionus the registry does not appear to actually respect this value properly:
```
$ oc logs docker-registry-1-knwnf -n default | grep URL
time="2018-01-28T03:00:12.310853118Z" level=info msg="Using \"172.30.183.222:5000\" as Docker Registry URL" go.version=go1.9.2 instance.id=a82b7ca8-0b55-4567-92ef-2c1744e6074a
$ oc get pod docker-registry-1-knwnf -o yaml | grep -A 2 ADDR
--
- name: REGISTRY_OPENSHIFT_SERVER_ADDR
value: docker-registry.default.svc:5000
```
| -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 bc4d81eb7..22294e3d4 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({'REGISTRY_OPENSHIFT_SERVER_ADDR':'docker-registry.default.svc:5000'}) }}" + openshift_hosted_registry_env_vars: "{{ openshift_hosted_registry_env_vars | combine({'OPENSHIFT_DEFAULT_REGISTRY':'docker-registry.default.svc:5000'}) }}" when: openshift_push_via_dns | bool - name: Update registry proxy settings for dc/docker-registry |