summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorSamuel Padgett <spadgett@redhat.com>2018-01-22 16:24:02 -0500
committerSamuel Padgett <spadgett@redhat.com>2018-01-25 14:56:10 -0500
commitef6d01b6c0a4000133ab443a0a3d52d686484fc9 (patch)
treea2c536b10f50bd7850119b9b58297d0d5d1a8a3b /playbooks/common/openshift-cluster
parent8cb61e9428e82e38070c1de0d6ab1fff45a7ff13 (diff)
downloadopenshift-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 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/post_control_plane.yml4
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml6
2 files changed, 9 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
index f790fd98d..de612da21 100644
--- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
@@ -6,7 +6,9 @@
hosts: oo_first_master
roles:
- role: openshift_web_console
- when: openshift_web_console_install | default(true) | bool
+ when:
+ - openshift_web_console_install | default(true) | bool
+ - openshift_upgrade_target is version_compare('3.9','>=')
- name: Upgrade default router and default registry
hosts: oo_first_master
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
index 1dcc38def..4e4ed54fc 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
@@ -112,3 +112,9 @@
state: started
- import_playbook: ../post_control_plane.yml
+
+- hosts: oo_masters
+ tasks:
+ - import_role:
+ name: openshift_web_console
+ tasks_from: remove_old_asset_config