diff options
| author | Samuel Padgett <spadgett@redhat.com> | 2018-01-22 16:24:02 -0500 |
|---|---|---|
| committer | Samuel Padgett <spadgett@redhat.com> | 2018-01-25 14:56:10 -0500 |
| commit | ef6d01b6c0a4000133ab443a0a3d52d686484fc9 (patch) | |
| tree | a2c536b10f50bd7850119b9b58297d0d5d1a8a3b /roles | |
| parent | 8cb61e9428e82e38070c1de0d6ab1fff45a7ff13 (diff) | |
| download | openshift-ef6d01b6c0a4000133ab443a0a3d52d686484fc9.tar.gz openshift-ef6d01b6c0a4000133ab443a0a3d52d686484fc9.tar.bz2 openshift-ef6d01b6c0a4000133ab443a0a3d52d686484fc9.tar.xz openshift-ef6d01b6c0a4000133ab443a0a3d52d686484fc9.zip | |
Remove old assetConfig from master-config.yaml
The `assetConfig` is no longer used now that the console is split into
its own pod.
- Remove `assetConfig` on upgrades to 3.9
- Stop writing logging and metrics URLs to assetConfig for 3.9
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/install_metrics.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_web_console/tasks/remove_old_asset_config.yml | 19 |
3 files changed, 21 insertions, 2 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index 3afd8680f..e4883bfa0 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -314,8 +314,8 @@ openshift_logging_install_eventrouter | default(false) | bool -# TODO: Remove when asset config is removed from master-config.yaml - include_tasks: update_master_config.yaml + when: not openshift.common.version_gte_3_9 # Update asset config in openshift-web-console namespace - name: Add Kibana route information to web console asset config diff --git a/roles/openshift_metrics/tasks/install_metrics.yaml b/roles/openshift_metrics/tasks/install_metrics.yaml index 0dd5d1621..6b6c21d71 100644 --- a/roles/openshift_metrics/tasks/install_metrics.yaml +++ b/roles/openshift_metrics/tasks/install_metrics.yaml @@ -67,8 +67,8 @@ with_items: "{{ hawkular_agent_object_defs.results }}" when: openshift_metrics_install_hawkular_agent | bool -# TODO: Remove when asset config is removed from master-config.yaml - include_tasks: update_master_config.yaml + when: not openshift.common.version_gte_3_9 # Update asset config in openshift-web-console namespace - name: Add metrics route information to web console asset config diff --git a/roles/openshift_web_console/tasks/remove_old_asset_config.yml b/roles/openshift_web_console/tasks/remove_old_asset_config.yml new file mode 100644 index 000000000..34158150c --- /dev/null +++ b/roles/openshift_web_console/tasks/remove_old_asset_config.yml @@ -0,0 +1,19 @@ +--- +# Remove the obsolete assetConfig stanza from master-config.yaml. Since the +# web console has been split out into a separate deployment, those settings +# are no longer used. +- name: Remove assetConfig from master-config.yaml + yedit: + state: absent + src: "{{ openshift.common.config_base }}/master/master-config.yaml" + key: assetConfig + +# This file was written by wire_aggregator.yml. It is no longer needed since +# the web console now discovers if the template service broker is running on +# startup. Remove the file if it exists. +- name: Remove obsolete web console / service catalog extension file + file: + state: absent + # Hard-code the path instead of using `openshift.common.config_base` since + # the path is hard-coded in wire_aggregator.yml. + path: /etc/origin/master/openshift-ansible-catalog-console.js |