summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2017-05-04 07:32:54 -0600
committerRich Megginson <rmeggins@redhat.com>2017-05-04 07:32:54 -0600
commit6aa7ca988f57bd597eab47ee0faf1154d8bff512 (patch)
tree7dc4a5c82652210cc3db7b46af957f4f8fb4ab84 /roles
parent03f33dae7238e0ffaac4f85d89af25be57dc5ecd (diff)
downloadopenshift-6aa7ca988f57bd597eab47ee0faf1154d8bff512.tar.gz
openshift-6aa7ca988f57bd597eab47ee0faf1154d8bff512.tar.bz2
openshift-6aa7ca988f57bd597eab47ee0faf1154d8bff512.tar.xz
openshift-6aa7ca988f57bd597eab47ee0faf1154d8bff512.zip
mux startup is broken without this fix
Diffstat (limited to 'roles')
-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