From 686e44eb23324044490facfa0514f5d480c8b8c1 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Wed, 31 Jan 2018 09:04:10 -0500 Subject: Don't update master-config.yaml with logging/metrics urls >= 3.9 --- playbooks/adhoc/openshift_hosted_logging_efk.yaml | 4 +++- playbooks/openshift-logging/private/config.yml | 1 + playbooks/openshift-metrics/private/config.yml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/playbooks/adhoc/openshift_hosted_logging_efk.yaml b/playbooks/adhoc/openshift_hosted_logging_efk.yaml index faeb332ad..dc6bbeac5 100644 --- a/playbooks/adhoc/openshift_hosted_logging_efk.yaml +++ b/playbooks/adhoc/openshift_hosted_logging_efk.yaml @@ -13,4 +13,6 @@ - import_role: name: openshift_logging tasks_from: update_master_config - when: openshift_hosted_logging_deploy | default(false) | bool + when: + - openshift_hosted_logging_deploy | default(false) | bool + - not openshift.common.version_gte_3_9 diff --git a/playbooks/openshift-logging/private/config.yml b/playbooks/openshift-logging/private/config.yml index d6b26647c..07aa8bfde 100644 --- a/playbooks/openshift-logging/private/config.yml +++ b/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 diff --git a/playbooks/openshift-metrics/private/config.yml b/playbooks/openshift-metrics/private/config.yml index 1e237e3f0..889ea77b1 100644 --- a/playbooks/openshift-metrics/private/config.yml +++ b/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 -- cgit v1.2.1 From fbb3dabe04db0fd090e990baa50aaea33829baa0 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Wed, 31 Jan 2018 11:20:56 -0500 Subject: Remove playbooks/adhoc/openshift_hosted_logging_efk.yaml --- playbooks/adhoc/openshift_hosted_logging_efk.yaml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 playbooks/adhoc/openshift_hosted_logging_efk.yaml diff --git a/playbooks/adhoc/openshift_hosted_logging_efk.yaml b/playbooks/adhoc/openshift_hosted_logging_efk.yaml deleted file mode 100644 index dc6bbeac5..000000000 --- a/playbooks/adhoc/openshift_hosted_logging_efk.yaml +++ /dev/null @@ -1,18 +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 - - not openshift.common.version_gte_3_9 -- cgit v1.2.1 From b3a5fb96ea09fa909ac7548e31322e6f65e7b792 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Wed, 31 Jan 2018 11:21:24 -0500 Subject: Only perform console configmap ops when >= 3.9 --- roles/openshift_logging/tasks/delete_logging.yaml | 4 +++- roles/openshift_logging/tasks/install_logging.yaml | 4 +++- roles/openshift_metrics/tasks/install_metrics.yaml | 4 +++- roles/openshift_metrics/tasks/uninstall_metrics.yaml | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/roles/openshift_logging/tasks/delete_logging.yaml b/roles/openshift_logging/tasks/delete_logging.yaml index ced7397b5..6be47b1f8 100644 --- a/roles/openshift_logging/tasks/delete_logging.yaml +++ b/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 diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index e4883bfa0..6bf59f125 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -326,4 +326,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 diff --git a/roles/openshift_metrics/tasks/install_metrics.yaml b/roles/openshift_metrics/tasks/install_metrics.yaml index 6b6c21d71..f05c8968d 100644 --- a/roles/openshift_metrics/tasks/install_metrics.yaml +++ b/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}} diff --git a/roles/openshift_metrics/tasks/uninstall_metrics.yaml b/roles/openshift_metrics/tasks/uninstall_metrics.yaml index 1664e9975..ed849916d 100644 --- a/roles/openshift_metrics/tasks/uninstall_metrics.yaml +++ b/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 -- cgit v1.2.1