From b74651d1495a13db5545609e62010ebc1e073379 Mon Sep 17 00:00:00 2001 From: Samuel Padgett Date: Wed, 17 Jan 2018 09:00:07 -0500 Subject: Remove old console asset config Stop writing deprecated config to the console config map. --- roles/openshift_logging/tasks/delete_logging.yaml | 2 +- roles/openshift_logging/tasks/install_logging.yaml | 5 ----- 2 files changed, 1 insertion(+), 6 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 00643c80e..ced7397b5 100644 --- a/roles/openshift_logging/tasks/delete_logging.yaml +++ b/roles/openshift_logging/tasks/delete_logging.yaml @@ -138,6 +138,6 @@ tasks_from: update_console_config.yml vars: console_config_edits: - - key: loggingPublicURL + - key: clusterInfo#loggingPublicURL value: "" when: openshift_web_console_install | default(true) | bool diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index f82e55b98..3afd8680f 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -326,9 +326,4 @@ console_config_edits: - key: clusterInfo#loggingPublicURL value: "https://{{ openshift_logging_kibana_hostname }}" - # Continue to set the old deprecated property until the - # origin-web-console image is updated for the new name. - # This will be removed in a future pull. - - key: loggingPublicURL - value: "https://{{ openshift_logging_kibana_hostname }}" when: openshift_web_console_install | default(true) | bool -- cgit v1.2.1