From dcea0d62f09fe4b47ba58010df41a90f14c35907 Mon Sep 17 00:00:00 2001 From: Samuel Padgett Date: Thu, 25 Jan 2018 13:33:31 -0500 Subject: Run console pods on the master Update the node selector for the console so that it runs on the masters. --- roles/openshift_web_console/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/openshift_web_console') diff --git a/roles/openshift_web_console/defaults/main.yml b/roles/openshift_web_console/defaults/main.yml index c747f73a8..627db393a 100644 --- a/roles/openshift_web_console/defaults/main.yml +++ b/roles/openshift_web_console/defaults/main.yml @@ -1,2 +1,2 @@ --- -openshift_web_console_nodeselector: "{{ openshift_hosted_infra_selector | default('region=infra') | map_from_pairs }}" +openshift_web_console_nodeselector: {"node-role.kubernetes.io/master":"true"} -- cgit v1.2.1 From ef6d01b6c0a4000133ab443a0a3d52d686484fc9 Mon Sep 17 00:00:00 2001 From: Samuel Padgett Date: Mon, 22 Jan 2018 16:24:02 -0500 Subject: 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 --- .../tasks/remove_old_asset_config.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 roles/openshift_web_console/tasks/remove_old_asset_config.yml (limited to 'roles/openshift_web_console') 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 -- cgit v1.2.1