summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging
diff options
context:
space:
mode:
authorSamuel Padgett <spadgett@redhat.com>2018-01-17 09:00:07 -0500
committerSamuel Padgett <spadgett@redhat.com>2018-01-19 13:10:20 -0500
commitb74651d1495a13db5545609e62010ebc1e073379 (patch)
tree4942ec5cc92df9b287ac83b681c8bdd42f36199c /roles/openshift_logging
parent7411bdcabfce83e21273d32c67e88925dfccd2df (diff)
downloadopenshift-b74651d1495a13db5545609e62010ebc1e073379.tar.gz
openshift-b74651d1495a13db5545609e62010ebc1e073379.tar.bz2
openshift-b74651d1495a13db5545609e62010ebc1e073379.tar.xz
openshift-b74651d1495a13db5545609e62010ebc1e073379.zip
Remove old console asset config
Stop writing deprecated config to the console config map.
Diffstat (limited to 'roles/openshift_logging')
-rw-r--r--roles/openshift_logging/tasks/delete_logging.yaml2
-rw-r--r--roles/openshift_logging/tasks/install_logging.yaml5
2 files changed, 1 insertions, 6 deletions
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