diff options
| author | Joel Diaz <jdiaz@redhat.com> | 2015-12-16 15:59:26 -0500 |
|---|---|---|
| committer | Joel Diaz <jdiaz@redhat.com> | 2015-12-16 15:59:26 -0500 |
| commit | c607f1ba93be5e9f16723074ff97ffd27b025f8c (patch) | |
| tree | 57d78b69cd526a57ad0258ba468868561626f384 /roles/openshift_node | |
| parent | 4dfe16e0e567a633cedd8ee56ffaed5110ca1629 (diff) | |
| parent | f826925c8217d5c9f150ef03ca8deb718c37c157 (diff) | |
| download | openshift-c607f1ba93be5e9f16723074ff97ffd27b025f8c.tar.gz openshift-c607f1ba93be5e9f16723074ff97ffd27b025f8c.tar.bz2 openshift-c607f1ba93be5e9f16723074ff97ffd27b025f8c.tar.xz openshift-c607f1ba93be5e9f16723074ff97ffd27b025f8c.zip | |
Merge pull request #1078 from joelddiaz/master
sync master -> prod
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index eef7bec9a..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: @@ -131,4 +131,4 @@ register: start_result - set_fact: - node_service_status_changed = start_result | changed + node_service_status_changed: start_result | changed |