summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-12-15 11:53:09 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-12-15 11:53:09 -0500
commite26eab4bdc817ef02a16e8b5c6c49e311a721e7b (patch)
treeb11c0627495210c4fad73424158a92d50afaf425 /roles/openshift_node
parentebc61582e7577ae09b856ff95a8aaef740057234 (diff)
parent072d4aacbe745cca7a768a60c13e65eba9d1fa48 (diff)
downloadopenshift-e26eab4bdc817ef02a16e8b5c6c49e311a721e7b.tar.gz
openshift-e26eab4bdc817ef02a16e8b5c6c49e311a721e7b.tar.bz2
openshift-e26eab4bdc817ef02a16e8b5c6c49e311a721e7b.tar.xz
openshift-e26eab4bdc817ef02a16e8b5c6c49e311a721e7b.zip
Merge pull request #1067 from dgoodwin/node-registry-bug
Fix registry modification for new deployment types.
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/tasks/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index f8711d15a..38bffc2e5 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -85,11 +85,11 @@
docker_additional_registries: "{{ lookup('oo_option', 'docker_additional_registries')
| oo_split() | union(['registry.access.redhat.com'])
| difference(['']) }}"
- when: openshift.common.deployment_type == 'enterprise'
+ when: openshift.common.deployment_type in ['enterprise', 'openshift-enterprise', 'atomic-enterprise']
- set_fact:
docker_additional_registries: "{{ lookup('oo_option', 'docker_additional_registries')
| oo_split() | difference(['']) }}"
- when: openshift.common.deployment_type != 'enterprise'
+ when: openshift.common.deployment_type not in ['enterprise', 'openshift-enterprise', 'atomic-enterprise']
- name: Add personal registries
lineinfile: