diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-29 13:37:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-29 13:37:58 -0800 |
| commit | 844156f49a1899dd9d6059207bf63e6d8b865ec6 (patch) | |
| tree | 75f909bac07eb73f23caff0cece8777df53614d1 /roles/contiv/templates/netmaster.j2 | |
| parent | 629e4d771badb6aaa5fcfe303d8d330acb68305a (diff) | |
| parent | 5ea67bc7b7123d1c108f77822a41c785b7ae84b8 (diff) | |
| download | openshift-844156f49a1899dd9d6059207bf63e6d8b865ec6.tar.gz openshift-844156f49a1899dd9d6059207bf63e6d8b865ec6.tar.bz2 openshift-844156f49a1899dd9d6059207bf63e6d8b865ec6.tar.xz openshift-844156f49a1899dd9d6059207bf63e6d8b865ec6.zip | |
Merge pull request #6923 from openshift/revert-6913-revert-6830-registry_addr
Automatic merge from submit-queue.
Revert "Revert "use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the registry hostname""
Reverts openshift/openshift-ansible#6913
image-registry has been fixed to properly respect this variable now. re-enabling this change.
Diffstat (limited to 'roles/contiv/templates/netmaster.j2')
0 files changed, 0 insertions, 0 deletions