1 files changed, 41 insertions, 20 deletions
diff --git a/roles/openshift_logging/tasks/start_cluster.yaml b/roles/openshift_logging/tasks/start_cluster.yaml
index a96ad3f3a..07489ae79 100644
--- a/roles/openshift_logging/tasks/start_cluster.yaml
+++ b/roles/openshift_logging/tasks/start_cluster.yaml
@@ -1,18 +1,21 @@
 ---
 - command: >
-    {{openshift.common.client_binary}} --config={{mktemp.stdout}}/admin.kubeconfig get node -o jsonpath='{.items[*].metadata.name}'
+    {{openshift.common.client_binary}} --config={{mktemp.stdout}}/admin.kubeconfig get node -o name
   register: fluentd_hosts
   when: "'--all' in openshift_logging_fluentd_hosts"
   check_mode: no
   changed_when: no
 
+- set_fact: openshift_logging_fluentd_hosts={{ fluentd_hosts.stdout_lines | regex_replace('node/', '') }}
+  when: "'--all' in openshift_logging_fluentd_hosts"
+
 - name: start fluentd
   include: label_node.yaml
   vars:
     host: "{{fluentd_host}}"
     label: "{{openshift_logging_fluentd_nodeselector.keys()[0]}}"
     value: "{{openshift_logging_fluentd_nodeselector.values()[0]}}"
-  with_items: "{{(fluentd_hosts.stdout_lines is defined) | ternary(fluentd_hosts.stdout_lines, openshift_logging_fluentd_hosts)}}"
+  with_items: "{{ openshift_logging_fluentd_hosts }}"
   loop_control:
     loop_var: fluentd_host
 
@@ -23,9 +26,12 @@
   changed_when: no
 
 - name: start elasticsearch
-  include: scale.yaml
-  vars:
-    desired: 1
+  oc_scale:
+    kind: dc
+    name: "{{object.split('/')[1]}}"
+    namespace: "{{openshift_logging_namespace}}"
+    kubeconfig: "{{mktemp.stdout}}/admin.kubeconfig"
+    replicas: 1
   with_items: "{{es_dc.stdout_lines}}"
   loop_control:
     loop_var: object
@@ -37,9 +43,12 @@
   changed_when: no
 
 - name: start kibana
-  include: scale.yaml
-  vars:
-    desired: "{{ openshift_logging_kibana_replica_count | default (1) }}"
+  oc_scale:
+    kind: dc
+    name: "{{object.split('/')[1]}}"
+    namespace: "{{openshift_logging_namespace}}"
+    kubeconfig: "{{mktemp.stdout}}/admin.kubeconfig"
+    replicas: "{{ openshift_logging_kibana_replica_count | default (1) }}"
   with_items: "{{kibana_dc.stdout_lines}}"
   loop_control:
     loop_var: object
@@ -51,9 +60,12 @@
   changed_when: no
 
 - name: start curator
-  include: scale.yaml
-  vars:
-    desired: 1
+  oc_scale:
+    kind: dc
+    name: "{{object.split('/')[1]}}"
+    namespace: "{{openshift_logging_namespace}}"
+    kubeconfig: "{{mktemp.stdout}}/admin.kubeconfig"
+    replicas: 1
   with_items: "{{curator_dc.stdout_lines}}"
   loop_control:
     loop_var: object
@@ -65,9 +77,12 @@
   changed_when: no
 
 - name: start elasticsearch-ops
-  include: scale.yaml
-  vars:
-    desired: 1
+  oc_scale:
+    kind: dc
+    name: "{{object.split('/')[1]}}"
+    namespace: "{{openshift_logging_namespace}}"
+    kubeconfig: "{{mktemp.stdout}}/admin.kubeconfig"
+    replicas: 1
   with_items: "{{es_dc.stdout_lines}}"
   loop_control:
     loop_var: object
@@ -80,9 +95,12 @@
   changed_when: no
 
 - name: start kibana-ops
-  include: scale.yaml
-  vars:
-    desired: "{{ openshift_logging_kibana_ops_replica_count | default (1) }}"
+  oc_scale:
+    kind: dc
+    name: "{{object.split('/')[1]}}"
+    namespace: "{{openshift_logging_namespace}}"
+    kubeconfig: "{{mktemp.stdout}}/admin.kubeconfig"
+    replicas: "{{ openshift_logging_kibana_ops_replica_count | default (1) }}"
   with_items: "{{kibana_dc.stdout_lines}}"
   loop_control:
     loop_var: object
@@ -95,9 +113,12 @@
   changed_when: no
 
 - name: start curator-ops
-  include: scale.yaml
-  vars:
-    desired: 1
+  oc_scale:
+    kind: dc
+    name: "{{object.split('/')[1]}}"
+    namespace: "{{openshift_logging_namespace}}"
+    kubeconfig: "{{mktemp.stdout}}/admin.kubeconfig"
+    replicas: 1
   with_items: "{{curator_dc.stdout_lines}}"
   loop_control:
     loop_var: object