Fixing evaluating if ops deployment needs to skip health check, removing logic for determining version, fixing pod check for elasticsearch to get running version

roles/openshift_logging/tasks/install_logging.yaml

@@ -131,12 +131,16 @@
     openshift_logging_elasticsearch_storage_type: "{{ elasticsearch_storage_type | default(default_elasticsearch_storage_type) }}"
     openshift_logging_elasticsearch_pvc_pv_selector: "{{ openshift_logging_es_pv_selector }}"
     openshift_logging_elasticsearch_pvc_storage_class_name: "{{ openshift_logging_es_pvc_storage_class_name | default() }}"
-    __logging_scale_up: True
 
   with_sequence: count={{ openshift_logging_es_cluster_size | int - openshift_logging_facts.elasticsearch.deploymentconfigs.keys() | count }}
   loop_control:
     loop_var: outer_item
 
+- set_fact:
+    __logging_scale_up: True
+  when:
+  - openshift_logging_es_cluster_size | int - openshift_logging_facts.elasticsearch.deploymentconfigs.keys() | count > 0
+
 - set_fact: es_ops_indices={{ es_ops_indices | default([]) + [item | int - 1] }}
   with_sequence: count={{ openshift_logging_facts.elasticsearch_ops.deploymentconfigs.keys() | count }}
   when:
@@ -222,7 +226,6 @@
     openshift_logging_es_hostname: "{{ openshift_logging_es_ops_hostname }}"
     openshift_logging_es_edge_term_policy: "{{ openshift_logging_es_ops_edge_term_policy | default('') }}"
     openshift_logging_es_allow_external: "{{ openshift_logging_es_ops_allow_external }}"
-    __logging_ops_scale_up: True
 
   with_sequence: count={{ openshift_logging_es_ops_cluster_size | int - openshift_logging_facts.elasticsearch_ops.deploymentconfigs.keys() | count }}
   loop_control:
@@ -230,6 +233,12 @@
   when:
   - openshift_logging_use_ops | bool
 
+- set_fact:
+    __logging_ops_scale_up: True
+  when:
+  - openshift_logging_use_ops | bool
+  - openshift_logging_es_ops_cluster_size | int - openshift_logging_facts.elasticsearch_ops.deploymentconfigs.keys() | count > 0
+
 
 ## Kibana
 - import_role:

roles/openshift_logging_curator/tasks/determine_version.yaml

@@ -1,17 +0,0 @@
----
-# debating making this a module instead?
-- fail:
-    msg: Missing version to install provided by 'openshift_logging_curator_image_version'
-  when: not openshift_logging_curator_image_version or openshift_logging_curator_image_version == ''
-
-- set_fact:
-    curator_version: "{{ __latest_curator_version }}"
-  when: openshift_logging_curator_image_version == 'latest'
-
-# should we just assume that we will have the correct major version?
-- set_fact: curator_version="{{ openshift_logging_curator_image_version | regex_replace('^v?(?P<major>\d)\.(?P<minor>\d).*$', '3_\\g<minor>') }}"
-  when: openshift_logging_curator_image_version != 'latest'
-
-- fail:
-    msg: Invalid version specified for Curator
-  when: curator_version not in __allowed_curator_versions

roles/openshift_logging_curator/tasks/main.yaml

@@ -12,8 +12,6 @@
     openshift_logging_curator_image_prefix: "{{ openshift_logging_curator_image_prefix | default(__openshift_logging_curator_image_prefix) }}"
     openshift_logging_curator_image_version: "{{ openshift_logging_curator_image_version | default(__openshift_logging_curator_image_version) }}"
 
-- include_tasks: determine_version.yaml
-
 - name: Ensure that Logging Curator has nodes to run on
   import_role:
     name: openshift_master

roles/openshift_logging_curator/vars/main.yml

@@ -1,3 +0,0 @@
----
-__latest_curator_version: "3_10"
-__allowed_curator_versions: ["3_5", "3_6", "3_7", "3_8", "3_9", "3_10"]

roles/openshift_logging_elasticsearch/tasks/determine_version.yaml

@@ -1,23 +0,0 @@
----
-# debating making this a module instead?
-- fail:
-    msg: Missing version to install provided by 'openshift_logging_elasticsearch_image_version'
-  when: not openshift_logging_elasticsearch_image_version or openshift_logging_elasticsearch_image_version == ''
-
-- set_fact:
-    es_version: "{{ __latest_es_version }}"
-  when: openshift_logging_elasticsearch_image_version == 'latest'
-
-# should we just assume that we will have the correct major version?
-- set_fact: es_version="{{ openshift_logging_elasticsearch_image_version | regex_replace('^v?(?P<major>\d)\.(?P<minor>\d).*$', '3_\\g<minor>') }}"
-  when:
-  - openshift_logging_elasticsearch_image_version != 'latest'
-  - not openshift_logging_es5_techpreview | default(false) | bool
-
-- fail:
-    msg: Invalid version specified for Elasticsearch
-  when:
-  - es_version not in __allowed_es_versions
-  - not openshift_logging_es5_techpreview | default(false) | bool
-
-- include_tasks: get_es_version.yml

roles/openshift_logging_elasticsearch/tasks/get_es_version.yml

@@ -1,23 +1,47 @@
 ---
-- command: >
-    {{ openshift_client_binary }} get pod -l component=es,provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[?(@.status.phase==\"Running\")].metadata.name}
-  register: _cluster_pods
+- oc_obj:
+    state: list
+    kind: pod
+    namespace: "{{ openshift_logging_elasticsearch_namespace }}"
+    selector: component=es
+  register: pod_list
+
+- set_fact:
+    available_pod: "{{ item.metadata.name }}"
+  with_items: "{{ pod_list.results.results[0]['items'] }}"
+  when:
+  - pod_list.results.results is defined
+  - item.status.phase == "Running"
+  - item.status.containerStatuses[0].ready == true
+  - item.status.containerStatuses[1].ready == true
 
 - name: "Getting ES version for logging-es cluster"
   command: >
-    {{ openshift_client_binary }} exec {{ _cluster_pods.stdout.split(' ')[0] }} -c elasticsearch -n {{ openshift_logging_elasticsearch_namespace }} -- {{ __es_local_curl }} -XGET 'https://localhost:9200/'
+    {{ openshift_client_binary }} exec {{ available_pod }} -c elasticsearch -n {{ openshift_logging_elasticsearch_namespace }} -- {{ __es_local_curl }} -XGET 'https://localhost:9200/'
   register: _curl_output
-  when: _cluster_pods.stdout_lines | count > 0
+  when: available_pod is defined
 
-- command: >
-    {{ openshift_client_binary }} get pod -l component=es-ops,provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[?(@.status.phase==\"Running\")].metadata.name}
-  register: _ops_cluster_pods
+- oc_obj:
+    state: list
+    kind: pod
+    namespace: "{{ openshift_logging_elasticsearch_namespace }}"
+    selector: component=es-ops
+  register: ops_pod_list
+
+- set_fact:
+    available_ops_pod: "{{ item.metadata.name }}"
+  with_items: "{{ ops_pod_list.results.results[0]['items'] }}"
+  when:
+  - ops_pod_list.results.results is defined
+  - item.status.phase == "Running"
+  - item.status.containerStatuses[0].ready == true
+  - item.status.containerStatuses[1].ready == true
 
 - name: "Getting ES version for logging-es-ops cluster"
   command: >
-    {{ openshift_client_binary }} exec {{ _ops_cluster_pods.stdout.split(' ')[0] }} -c elasticsearch -n {{ openshift_logging_elasticsearch_namespace }} -- {{ __es_local_curl }} -XGET 'https://localhost:9200/'
+    {{ openshift_client_binary }} exec {{ available_ops_pod }} -c elasticsearch -n {{ openshift_logging_elasticsearch_namespace }} -- {{ __es_local_curl }} -XGET 'https://localhost:9200/'
   register: _ops_curl_output
-  when: _ops_cluster_pods.stdout_lines | count > 0
+  when: available_ops_pod is defined
 
 - set_fact:
     _es_output: "{{ _curl_output.stdout | from_json }}"
@@ -30,13 +54,13 @@
 - set_fact:
     _es_installed_version: "{{ _es_output.version.number }}"
   when:
-    - _es_output is defined
-    - _es_output.version is defined
-    - _es_output.version.number is defined
+  - _es_output is defined
+  - _es_output.version is defined
+  - _es_output.version.number is defined
 
 - set_fact:
     _es_ops_installed_version: "{{ _es_ops_output.version.number }}"
   when:
-    - _es_ops_output is defined
-    - _es_ops_output.version is defined
-    - _es_ops_output.version.number is defined
+  - _es_ops_output is defined
+  - _es_ops_output.version is defined
+  - _es_ops_output.version.number is defined

roles/openshift_logging_elasticsearch/tasks/main.yaml

@@ -38,7 +38,7 @@
     openshift_logging_elasticsearch_image_prefix: "{{ openshift_logging_elasticsearch_image_prefix | default(__openshift_logging_elasticsearch_image_prefix) }}"
     openshift_logging_elasticsearch_image_version: "{{ openshift_logging_elasticsearch_image_version | default(__openshift_logging_elasticsearch_image_version) }}"
 
-- include_tasks: determine_version.yaml
+- include_tasks: get_es_version.yml
 
 - set_fact:
     full_restart_cluster: True

roles/openshift_logging_elasticsearch/tasks/restart_cluster.yml

@@ -69,12 +69,12 @@
   # If we are currently restarting the "es-ops" cluster we want to check if we are scaling up the number of ops nodes
   # If we've created a new node for that cluster then the appropriate variable will be true, otherwise we default to false
   - set_fact:
-      _skip_healthcheck: "{{ __logging_scale_up | default(false) if _cluster_component == 'es' else __logging_ops_scale_up | default(false) }}"
+      _skip_healthcheck: "{{ ( __logging_scale_up | default(false) ) if _cluster_component == 'es' else ( __logging_ops_scale_up | default(false) ) }}"
 
   ## restart all dcs for full restart
   - name: "Restart ES node {{ _es_node }}"
     include_tasks: restart_es_node.yml
-    with_items: "{{ _cluster_dcs }}"
+    with_items: "{{ _cluster_dcs.stdout_lines }}"
     loop_control:
       loop_var: _es_node
     when:

roles/openshift_logging_elasticsearch/vars/main.yml

@@ -1,6 +1,4 @@
 ---
-__latest_es_version: "3_10"
-__allowed_es_versions: ["3_5", "3_6", "3_7", "3_8", "3_9", "3_10"]
 __allowed_es_types: ["data-master", "data-client", "master", "client"]
 __es_log_appenders: ['file', 'console']
 __kibana_index_modes: ["unique", "shared_ops"]

roles/openshift_logging_fluentd/tasks/determine_version.yaml

@@ -1,17 +0,0 @@
----
-# debating making this a module instead?
-- fail:
-    msg: Missing version to install provided by 'openshift_logging_fluentd_image_version'
-  when: not openshift_logging_fluentd_image_version or openshift_logging_fluentd_image_version == ''
-
-- set_fact:
-    fluentd_version: "{{ __latest_fluentd_version }}"
-  when: openshift_logging_fluentd_image_version == 'latest'
-
-# should we just assume that we will have the correct major version?
-- set_fact: fluentd_version="{{ openshift_logging_fluentd_image_version | regex_replace('^v?(?P<major>\d)\.(?P<minor>\d).*$', '3_\\g<minor>') }}"
-  when: openshift_logging_fluentd_image_version != 'latest'
-
-- fail:
-    msg: Invalid version specified for Fluentd
-  when: fluentd_version not in __allowed_fluentd_versions

roles/openshift_logging_fluentd/tasks/main.yaml

@@ -47,8 +47,6 @@
     openshift_logging_fluentd_image_prefix: "{{ openshift_logging_fluentd_image_prefix | default(__openshift_logging_fluentd_image_prefix) }}"
     openshift_logging_fluentd_image_version: "{{ openshift_logging_fluentd_image_version | default(__openshift_logging_fluentd_image_version) }}"
 
-- include_tasks: determine_version.yaml
-
 # allow passing in a tempdir
 - name: Create temp directory for doing work in
   command: mktemp -d /tmp/openshift-logging-ansible-XXXXXX

roles/openshift_logging_fluentd/vars/main.yml

@@ -1,5 +1,3 @@
 ---
-__latest_fluentd_version: "3_10"
-__allowed_fluentd_versions: ["3_5", "3_6", "3_7", "3_8", "3_9", "3_10"]
 __allowed_fluentd_types: ["hosted", "secure-aggregator", "secure-host"]
 __allowed_mux_client_modes: ["minimal", "maximal"]

roles/openshift_logging_kibana/tasks/determine_version.yaml

@@ -1,17 +0,0 @@
----
-# debating making this a module instead?
-- fail:
-    msg: Missing version to install provided by 'openshift_logging_kibana_image_version'
-  when: not openshift_logging_kibana_image_version or openshift_logging_kibana_image_version == ''
-
-- set_fact:
-    kibana_version: "{{ __latest_kibana_version }}"
-  when: openshift_logging_kibana_image_version == 'latest'
-
-# should we just assume that we will have the correct major version?
-- set_fact: kibana_version="{{ openshift_logging_kibana_image_version | regex_replace('^v?(?P<major>\d)\.(?P<minor>\d).*$', '3_\\g<minor>') }}"
-  when: openshift_logging_kibana_image_version != 'latest'
-
-- fail:
-    msg: Invalid version specified for Kibana
-  when: kibana_version not in __allowed_kibana_versions

roles/openshift_logging_kibana/tasks/main.yaml

@@ -23,8 +23,6 @@
     openshift_logging_kibana_proxy_image_prefix: "{{ openshift_logging_kibana_proxy_image_prefix | default(__openshift_logging_kibana_proxy_image_prefix) }}"
     openshift_logging_kibana_proxy_image_version: "{{ openshift_logging_kibana_proxy_image_version | default(__openshift_logging_kibana_proxy_image_version) }}"
 
-- include_tasks: determine_version.yaml
-
 # allow passing in a tempdir
 - name: Create temp directory for doing work in
   command: mktemp -d /tmp/openshift-logging-ansible-XXXXXX

roles/openshift_logging_kibana/vars/main.yml

@@ -1,3 +0,0 @@
----
-__latest_kibana_version: "3_10"
-__allowed_kibana_versions: ["3_5", "3_6", "3_7", "3_8", "3_9", "3_10"]

roles/openshift_logging_mux/tasks/determine_version.yaml

@@ -1,17 +0,0 @@
----
-# debating making this a module instead?
-- fail:
-    msg: Missing version to install provided by 'openshift_logging_mux_image_version'
-  when: not openshift_logging_mux_image_version or openshift_logging_mux_image_version == ''
-
-- set_fact:
-    mux_version: "{{ __latest_mux_version }}"
-  when: openshift_logging_mux_image_version == 'latest'
-
-# should we just assume that we will have the correct major version?
-- set_fact: mux_version="{{ openshift_logging_mux_image_version | regex_replace('^v?(?P<major>\d)\.(?P<minor>\d).*$', '3_\\g<minor>') }}"
-  when: openshift_logging_mux_image_version != 'latest'
-
-- fail:
-    msg: Invalid version specified for mux
-  when: mux_version not in __allowed_mux_versions

roles/openshift_logging_mux/tasks/main.yaml

@@ -28,8 +28,6 @@
     openshift_logging_mux_image_prefix: "{{ openshift_logging_mux_image_prefix | default(__openshift_logging_mux_image_prefix) }}"
     openshift_logging_mux_image_version: "{{ openshift_logging_mux_image_version | default(__openshift_logging_mux_image_version) }}"
 
-- include_tasks: determine_version.yaml
-
 # allow passing in a tempdir
 - name: Create temp directory for doing work in
   command: mktemp -d /tmp/openshift-logging-ansible-XXXXXX

roles/openshift_logging_mux/vars/main.yml

@@ -1,3 +0,0 @@
----
-__latest_mux_version: "3_10"
-__allowed_mux_versions: ["3_5", "3_6", "3_7", "3_8", "3_9", "3_10"]