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 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'roles/openshift_logging') 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 -- cgit v1.2.3