Parcourir la source

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
OpenShift Merge Robot il y a 7 ans
Parent
commit
0b57e113db
1 fichiers modifiés avec 1 ajouts et 1 suppressions
  1. 1 1
      roles/openshift_hosted/tasks/registry.yml

+ 1 - 1
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