summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2015-12-15 10:59:48 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2015-12-15 12:14:43 -0400
commit072d4aacbe745cca7a768a60c13e65eba9d1fa48 (patch)
treeef12b46dcf03124e5dff2dfd039e5e3c26038f83
parent27b8533edca79ba78a3e443bd33992a5415662f4 (diff)
downloadopenshift-072d4aacbe745cca7a768a60c13e65eba9d1fa48.tar.gz
openshift-072d4aacbe745cca7a768a60c13e65eba9d1fa48.tar.bz2
openshift-072d4aacbe745cca7a768a60c13e65eba9d1fa48.tar.xz
openshift-072d4aacbe745cca7a768a60c13e65eba9d1fa48.zip
Fix registry modification for new deployment types.
New deployment types were missed when installing with additional docker registries.
-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 eef7bec9a..b6150a00c 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: