summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-02 21:11:01 -0500
committerGitHub <noreply@github.com>2017-05-02 21:11:01 -0500
commit0a195fb83ecd592ca0b2c897dc240298cd64a75e (patch)
treeb1a3631d108a92ccc6969b27272f9e9328419350
parent42d68b49d6e57949b4dec7840c15c9137b30f70c (diff)
parent08c105c2b634bb4764c9889eae8081834469af04 (diff)
downloadopenshift-0a195fb83ecd592ca0b2c897dc240298cd64a75e.tar.gz
openshift-0a195fb83ecd592ca0b2c897dc240298cd64a75e.tar.bz2
openshift-0a195fb83ecd592ca0b2c897dc240298cd64a75e.tar.xz
openshift-0a195fb83ecd592ca0b2c897dc240298cd64a75e.zip
Merge pull request #4070 from ewolinetz/mux_scaleup_fix
Merged by openshift-bot
-rw-r--r--roles/openshift_logging/tasks/start_cluster.yaml2
-rw-r--r--roles/openshift_logging/tasks/stop_cluster.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/tasks/start_cluster.yaml b/roles/openshift_logging/tasks/start_cluster.yaml
index ef9a42a9e..7fec5db42 100644
--- a/roles/openshift_logging/tasks/start_cluster.yaml
+++ b/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:
diff --git a/roles/openshift_logging/tasks/stop_cluster.yaml b/roles/openshift_logging/tasks/stop_cluster.yaml
index d20c57cc1..c078e4b2f 100644
--- a/roles/openshift_logging/tasks/stop_cluster.yaml
+++ b/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