summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-07-01 13:11:03 -0400
committerGitHub <noreply@github.com>2017-07-01 13:11:03 -0400
commit7c045ba7cfb6c6d15ea2d94830e048c335bda594 (patch)
treee225160d720ead92e8dad8578089ef111a92e372 /roles
parentc534ae91e998d28b974260aa090d182f7324c4ac (diff)
parentc676e27bf29c2decc39bef186b43081e861e92e6 (diff)
downloadopenshift-7c045ba7cfb6c6d15ea2d94830e048c335bda594.tar.gz
openshift-7c045ba7cfb6c6d15ea2d94830e048c335bda594.tar.bz2
openshift-7c045ba7cfb6c6d15ea2d94830e048c335bda594.tar.xz
openshift-7c045ba7cfb6c6d15ea2d94830e048c335bda594.zip
Merge pull request #4658 from abutcher/openshift-default-registry
Merged by openshift-bot
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_hosted/tasks/registry/registry.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml
index 2eeb2e7ce..b946ec8ca 100644
--- a/roles/openshift_hosted/tasks/registry/registry.yml
+++ b/roles/openshift_hosted/tasks/registry/registry.yml
@@ -56,6 +56,11 @@
openshift_hosted_registry_force:
- False
+- 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'}) }}"
+ when: openshift_push_via_dns | default(false) | bool
+
- name: Create the registry service account
oc_serviceaccount:
name: "{{ openshift_hosted_registry_serviceaccount }}"