소스 검색

Merge pull request #4070 from ewolinetz/mux_scaleup_fix

Merged by openshift-bot
OpenShift Bot 8 년 전
부모
커밋
0a195fb83e
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      roles/openshift_logging/tasks/start_cluster.yaml
  2. 1 1
      roles/openshift_logging/tasks/stop_cluster.yaml

+ 1 - 1
roles/openshift_logging/tasks/start_cluster.yaml

@@ -36,7 +36,7 @@
     name: "{{ object }}"
     namespace: "{{openshift_logging_namespace}}"
     replicas: "{{ openshift_logging_mux_replica_count | default (1) }}"
-  with_items: "{{ mux_dc.results.results[0]['items'] | map(attribute='metadata.name') | list }}"
+  with_items: "{{ mux_dc.results.results[0]['items'] if 'results' in mux_dc else {} | map(attribute='metadata.name') | list }}"
   loop_control:
     loop_var: object
   when:

+ 1 - 1
roles/openshift_logging/tasks/stop_cluster.yaml

@@ -36,7 +36,7 @@
     name: "{{ object }}"
     namespace: "{{openshift_logging_namespace}}"
     replicas: 0
-  with_items: "{{ mux_dc.results.results[0]['items'] | map(attribute='metadata.name') | list }}"
+  with_items: "{{ mux_dc.results.results[0]['items'] if 'results' in mux_dc else {} | map(attribute='metadata.name') | list }}"
   loop_control:
     loop_var: object
   when: openshift_logging_use_mux