소스 검색

Merge pull request #6076 from abutcher/bz1511357

Bug 1511357: Task "Reload generated facts" failed while scaling up containerized masters
Scott Dodson 7 년 전
부모
커밋
e5a319cf8c
2개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      playbooks/openshift-loadbalancer/private/config.yml
  2. 2 1
      roles/openshift_ca/tasks/main.yml

+ 1 - 1
playbooks/openshift-loadbalancer/private/config.yml

@@ -24,7 +24,7 @@
                                                                                openshift_use_nuage | default(false),
                                                                                nuage_mon_rest_server_port | default(none)))
                                           + openshift_loadbalancer_additional_backends | default([]) }}"
-    openshift_image_tag: "{{ hostvars[groups.oo_first_master.0].openshift_image_tag }}"
+    openshift_image_tag: "{{ hostvars[groups.oo_masters_to_config.0].openshift_image_tag }}"
   roles:
   - role: openshift_loadbalancer
   - role: tuned

+ 2 - 1
roles/openshift_ca/tasks/main.yml

@@ -19,7 +19,8 @@
 
 - name: Reload generated facts
   openshift_facts:
-  when: hostvars[openshift_ca_host].install_result is changed
+  when:
+  - hostvars[openshift_ca_host].install_result | default({'changed':false}) is changed
 
 - name: Create openshift_ca_config_dir if it does not exist
   file: