Updating upgrade_logging to be more idempotent

4 files changed, 27 insertions, 15 deletions

diff --git a/roles/openshift_logging/tasks/install_curator.yaml b/roles/openshift_logging/tasks/install_curator.yaml
index 35116ae2b..8f2825552 100644
--- a/roles/openshift_logging/tasks/install_curator.yaml
+++ b/roles/openshift_logging/tasks/install_curator.yaml
@@ -1,5 +1,6 @@
 ---
-- command: >
+- name: Check Curator current replica count
+  command: >
     {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig get dc/logging-curator
     -o jsonpath='{.spec.replicas}' -n {{openshift_logging_namespace}}
   register: curator_replica_count
@@ -7,7 +8,8 @@
   ignore_errors: yes
   changed_when: no
 
-- command: >
+- name: Check Curator ops current replica count
+  command: >
     {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig get dc/logging-curator-ops
     -o jsonpath='{.spec.replicas}' -n {{openshift_logging_namespace}}
   register: curator_ops_replica_count
@@ -28,7 +30,7 @@
     es_port: "{{openshift_logging_es_port}}"
     curator_cpu_limit: "{{openshift_logging_curator_cpu_limit }}"
     curator_memory_limit: "{{openshift_logging_curator_memory_limit }}"
-    replicas: "{{curator_replica_count.stdout | default (1)}}"
+    replicas: "{{curator_replica_count.stdout | default (0)}}"
   check_mode: no
   changed_when: no
 
@@ -43,7 +45,7 @@
     es_port: "{{openshift_logging_es_ops_port}}"
     curator_cpu_limit: "{{openshift_logging_curator_ops_cpu_limit }}"
     curator_memory_limit: "{{openshift_logging_curator_ops_memory_limit }}"
-    replicas: "{{curator_ops_replica_count.stdout | default (1)}}"
+    replicas: "{{curator_ops_replica_count.stdout | default (0)}}"
   when: openshift_logging_use_ops
   check_mode: no
   changed_when: no
diff --git a/roles/openshift_logging/tasks/install_kibana.yaml b/roles/openshift_logging/tasks/install_kibana.yaml
index f4ce85f97..de4b018dd 100644
--- a/roles/openshift_logging/tasks/install_kibana.yaml
+++ b/roles/openshift_logging/tasks/install_kibana.yaml
@@ -1,5 +1,6 @@
 ---
-- command: >
+- name: Check Kibana current replica count
+  command: >
     {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig get dc/logging-kibana
     -o jsonpath='{.spec.replicas}' -n {{openshift_logging_namespace}}
   register: kibana_replica_count
@@ -7,7 +8,8 @@
   ignore_errors: yes
   changed_when: no
 
-- command: >
+- name: Check Kibana ops current replica count
+  command: >
     {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig get dc/logging-kibana-ops
     -o jsonpath='{.spec.replicas}' -n {{openshift_logging_namespace}}
   register: kibana_ops_replica_count
diff --git a/roles/openshift_logging/tasks/start_cluster.yaml b/roles/openshift_logging/tasks/start_cluster.yaml
index 4ce6d1aa7..a96ad3f3a 100644
--- a/roles/openshift_logging/tasks/start_cluster.yaml
+++ b/roles/openshift_logging/tasks/start_cluster.yaml
@@ -39,7 +39,7 @@
 - name: start kibana
   include: scale.yaml
   vars:
-    desired: 1
+    desired: "{{ openshift_logging_kibana_replica_count | default (1) }}"
   with_items: "{{kibana_dc.stdout_lines}}"
   loop_control:
     loop_var: object
@@ -82,7 +82,7 @@
 - name: start kibana-ops
   include: scale.yaml
   vars:
-    desired: 1
+    desired: "{{ openshift_logging_kibana_ops_replica_count | default (1) }}"
   with_items: "{{kibana_dc.stdout_lines}}"
   loop_control:
     loop_var: object
diff --git a/roles/openshift_logging/tasks/upgrade_logging.yaml b/roles/openshift_logging/tasks/upgrade_logging.yaml
index 9b285a5fe..a93463239 100644
--- a/roles/openshift_logging/tasks/upgrade_logging.yaml
+++ b/roles/openshift_logging/tasks/upgrade_logging.yaml
@@ -7,7 +7,7 @@
   vars:
     start_cluster: False
 
-# ensure that ES is running
+# start ES so that we can run migrate script
 - command: >
     {{openshift.common.client_binary}} --config={{mktemp.stdout}}/admin.kubeconfig get dc -l component=es -o name -n {{openshift_logging_namespace}}
   register: es_dc
@@ -21,13 +21,21 @@
   loop_control:
     loop_var: object
 
-- copy:
-    src: es_migration.sh
-    dest: {{mktemp.stdout}}/es_migration.sh
+- command: >
+    {{ openshift.common.client_binary}} --config={{mktemp.stdout}}/admin.kubeconfig get pods -n {{openshift_logging_namespace}} -l component=es -o jsonpath='{.items[?(@.status.phase == "Running")].metadata.name}'
+  register: running_pod
+  until: running_pod.stdout != ''
+  retries: 30
+  delay: 10
+  changed_when: no
+  check_mode: no
 
-- name: Run upgrade scripts
-  command: >
-    sh {{mktemp.stdout}}/es_migration.sh {{openshift.common.config_base}}/logging/ca.crt {{openshift.common.config_base}}/logging/system.admin.key {{openshift.common.config_base}}/logging/system.admin.crt {{openshift_logging_es_host}} {{openshift_logging_es_port}} {{openshift_logging_namespace}}
+- name: Run upgrade script
+  script: es_migration.sh {{openshift.common.config_base}}/logging/ca.crt {{openshift.common.config_base}}/logging/system.admin.key {{openshift.common.config_base}}/logging/system.admin.crt {{openshift_logging_es_host}} {{openshift_logging_es_port}} {{openshift_logging_namespace}}
+  register: script_output
+  changed_when:
+    - script_output.rc == 0
+    - script_output.stdout.find("skipping update_for_uuid") == -1 or script_output.stdout.find("skipping update_for_common_data_model") == -1
 
 - name: Start up rest of cluster
   include: start_cluster.yaml