diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-20 20:56:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 20:56:02 -0800 |
| commit | b1f728d464e8ac4b80462b3dbaa87c631430368b (patch) | |
| tree | 677da0d5bd16409a64816666688dbcfcb8cb9d53 /roles/openshift_logging | |
| parent | d5a464bddf793e64a2c3937f61b109e0f801e6b5 (diff) | |
| parent | b74651d1495a13db5545609e62010ebc1e073379 (diff) | |
| download | openshift-b1f728d464e8ac4b80462b3dbaa87c631430368b.tar.gz openshift-b1f728d464e8ac4b80462b3dbaa87c631430368b.tar.bz2 openshift-b1f728d464e8ac4b80462b3dbaa87c631430368b.tar.xz openshift-b1f728d464e8ac4b80462b3dbaa87c631430368b.zip | |
Merge pull request #6754 from spadgett/remove-old-console-config
Automatic merge from submit-queue.
Remove obsolete properties from console config map
Stop writing deprecated config to the console config map.
/hold
This can't be merged until https://github.com/openshift/origin-web-console-server/pull/20 merges.
Follow on to https://github.com/openshift/openshift-ansible/pull/6730
Diffstat (limited to 'roles/openshift_logging')
| -rw-r--r-- | roles/openshift_logging/tasks/delete_logging.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 5 |
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 |