diff options
author | Samuel Padgett <spadgett@redhat.com> | 2018-01-15 09:06:16 -0500 |
---|---|---|
committer | Samuel Padgett <spadgett@redhat.com> | 2018-01-16 16:16:01 -0500 |
commit | b498f10bf3e0c755dba6ce45913bd163475989fb (patch) | |
tree | eb8e58b6e4f5221bfe8500fc43af5ee769c2979c /roles/openshift_web_console/tasks/install.yml | |
parent | 9424e6ffe7919c9651e860fe606895c7ab6b7ca8 (diff) | |
download | openshift-b498f10bf3e0c755dba6ce45913bd163475989fb.tar.gz openshift-b498f10bf3e0c755dba6ce45913bd163475989fb.tar.bz2 openshift-b498f10bf3e0c755dba6ce45913bd163475989fb.tar.xz openshift-b498f10bf3e0c755dba6ce45913bd163475989fb.zip |
Update console config for API changes
Diffstat (limited to 'roles/openshift_web_console/tasks/install.yml')
-rw-r--r-- | roles/openshift_web_console/tasks/install.yml | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/roles/openshift_web_console/tasks/install.yml b/roles/openshift_web_console/tasks/install.yml index 287d8973d..50e72657f 100644 --- a/roles/openshift_web_console/tasks/install.yml +++ b/roles/openshift_web_console/tasks/install.yml @@ -39,13 +39,40 @@ yedit: src: "{{ mktemp.stdout }}/{{ __console_config_file }}" edits: - - key: logoutURL + - key: clusterInfo#consolePublicURL + # Must have a trailing slash + value: "{{ openshift.master.public_console_url }}/" + - key: clusterInfo#masterPublicURL + value: "{{ openshift.master.public_api_url }}" + - key: clusterInfo#logoutPublicURL 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 }}" + separator: '#' + state: present - slurp: src: "{{ mktemp.stdout }}/{{ __console_config_file }}" |