summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-05-05 09:41:37 -0400
committerGitHub <noreply@github.com>2017-05-05 09:41:37 -0400
commit37d759f17a772b9ddf1e6b49c023dca6fc79d801 (patch)
treed5423741923c1bac439c93a05ec66ce890dd0040 /roles/openshift_logging
parent8539d242451d48f1bfb29d2ab957897cdae08160 (diff)
parent6aa7ca988f57bd597eab47ee0faf1154d8bff512 (diff)
downloadopenshift-37d759f17a772b9ddf1e6b49c023dca6fc79d801.tar.gz
openshift-37d759f17a772b9ddf1e6b49c023dca6fc79d801.tar.bz2
openshift-37d759f17a772b9ddf1e6b49c023dca6fc79d801.tar.xz
openshift-37d759f17a772b9ddf1e6b49c023dca6fc79d801.zip
Merge pull request #4093 from richm/mux-result-startup-fix
mux startup is broken without this fix
Diffstat (limited to 'roles/openshift_logging')
-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 7fec5db42..c1592b830 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'] if 'results' in mux_dc else {} | map(attribute='metadata.name') | list }}"
+ with_items: "{{ mux_dc.results.results[0]['items'] | map(attribute='metadata.name') | list if 'results' in mux_dc else [] }}"
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 c078e4b2f..f4b419d84 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'] if 'results' in mux_dc else {} | map(attribute='metadata.name') | list }}"
+ with_items: "{{ mux_dc.results.results[0]['items'] | map(attribute='metadata.name') | list if 'results' in mux_dc else [] }}"
loop_control:
loop_var: object
when: openshift_logging_use_mux