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_web_console | |
| 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_web_console')
| -rw-r--r-- | roles/openshift_web_console/tasks/install.yml | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/roles/openshift_web_console/tasks/install.yml b/roles/openshift_web_console/tasks/install.yml index f2e6026dc..de852e80b 100644 --- a/roles/openshift_web_console/tasks/install.yml +++ b/roles/openshift_web_console/tasks/install.yml @@ -53,29 +53,12 @@ value: "{{ openshift.master.logout_url | default('') }}" - key: features#inactivityTimeoutMinutes value: "{{ openshift_web_console_inactivity_timeout_minutes | default(0) }}" - - # TODO: The new extensions properties cannot be set until - # origin-web-console-server has been updated with the API changes since - # `extensions` in the old asset config was an array. - - # - key: extensions#scriptURLs - # value: "{{ openshift_web_console_extension_script_urls | default([]) }}" - # - key: extensions#stylesheetURLs - # value: "{{ openshift_web_console_extension_stylesheet_urls | default([]) }}" - # - key: extensions#properties - # value: "{{ openshift_web_console_extension_properties | default({}) }}" - - # DEPRECATED PROPERTIES - # These properties have been renamed and will be removed from the install - # in a future pull. Keep both the old and new properties for now so that - # the install is not broken while the origin-web-console image is updated. - - key: publicURL - # Must have a trailing slash - value: "{{ openshift.master.public_console_url }}/" - - key: logoutURL - value: "{{ openshift.master.logout_url | default('') }}" - - key: masterPublicURL - value: "{{ openshift.master.public_api_url }}" + - key: extensions#scriptURLs + value: "{{ openshift_web_console_extension_script_urls | default([]) }}" + - key: extensions#stylesheetURLs + value: "{{ openshift_web_console_extension_stylesheet_urls | default([]) }}" + - key: extensions#properties + value: "{{ openshift_web_console_extension_properties | default({}) }}" separator: '#' state: present |