Просмотр исходного кода

Merge pull request #1067 from dgoodwin/node-registry-bug

Fix registry modification for new deployment types.
Thomas Wiest 9 лет назад
Родитель
Сommit
e26eab4bdc
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      roles/openshift_node/tasks/main.yml

+ 2 - 2
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: