Merge pull request #6952 from sdodson/bz1540462

Automatic merge from submit-queue.

Don't update master-config.yaml with logging/metrics urls >= 3.9

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1540462

I thought about refactoring things just to move the assetConfig vs ConfigMap update into update_master_config but the tasks get called on different hosts via plays.

playbooks/adhoc/openshift_hosted_logging_efk.yaml

@@ -1,16 +0,0 @@
----
-- hosts: masters[0]
-  roles:
-  - role: openshift_logging
-    openshift_hosted_logging_cleanup: no
-
-- name: Update master-config for publicLoggingURL
-  hosts: masters:!masters[0]
-  pre_tasks:
-  - set_fact:
-      openshift_logging_kibana_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ openshift_master_default_subdomain }}"
-  tasks:
-  - import_role:
-      name: openshift_logging
-      tasks_from: update_master_config
-    when: openshift_hosted_logging_deploy | default(false) | bool

playbooks/openshift-logging/private/config.yml

@@ -24,6 +24,7 @@
     - import_role:
         name: openshift_logging
         tasks_from: update_master_config
+      when: not openshift.common.version_gte_3_9
 
 - name: Logging Install Checkpoint End
   hosts: all

playbooks/openshift-metrics/private/config.yml

@@ -25,6 +25,7 @@
     import_role:
       name: openshift_metrics
       tasks_from: update_master_config.yaml
+    when: not openshift.common.version_gte_3_9
 
 - name: Metrics Install Checkpoint End
   hosts: all

roles/openshift_logging/tasks/delete_logging.yaml

@@ -140,4 +140,6 @@
     console_config_edits:
       - key: clusterInfo#loggingPublicURL
         value: ""
-  when: openshift_web_console_install | default(true) | bool
+  when:
+    - openshift_web_console_install | default(true) | bool
+    - openshift.common.version_gte_3_9

roles/openshift_logging/tasks/install_logging.yaml

@@ -335,4 +335,6 @@
     console_config_edits:
     - key: clusterInfo#loggingPublicURL
       value: "https://{{ openshift_logging_kibana_hostname }}"
-  when: openshift_web_console_install | default(true) | bool
+  when:
+  - openshift_web_console_install | default(true) | bool
+  - openshift.common.version_gte_3_9

roles/openshift_metrics/tasks/install_metrics.yaml

@@ -79,7 +79,9 @@
     console_config_edits:
       - key: clusterInfo#metricsPublicURL
         value: "https://{{ openshift_metrics_hawkular_hostname}}/hawkular/metrics"
-  when: openshift_web_console_install | default(true) | bool
+  when:
+    - openshift_web_console_install | default(true) | bool
+    - openshift.common.version_gte_3_9
 
 - command: >
     {{openshift_client_binary}}

roles/openshift_metrics/tasks/uninstall_metrics.yaml

@@ -28,4 +28,6 @@
     console_config_edits:
       - key: clusterInfo#metricsPublicURL
         value: ""
-  when: openshift_web_console_install | default(true) | bool
+  when:
+    - openshift_web_console_install | default(true) | bool
+    - openshift.common.version_gte_3_9