diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-26 10:41:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 10:41:44 -0500 |
| commit | c6423636a4d14139960f4677dbab8fa646d1cb0c (patch) | |
| tree | 56b6d96449cd4819959ab64ea391eaf0a8af856c /playbooks/common | |
| parent | 6e9a9c3e50446a1bd716272e4a47785ad8ecbf08 (diff) | |
| parent | ef6d01b6c0a4000133ab443a0a3d52d686484fc9 (diff) | |
| download | openshift-c6423636a4d14139960f4677dbab8fa646d1cb0c.tar.gz openshift-c6423636a4d14139960f4677dbab8fa646d1cb0c.tar.bz2 openshift-c6423636a4d14139960f4677dbab8fa646d1cb0c.tar.xz openshift-c6423636a4d14139960f4677dbab8fa646d1cb0c.zip | |
Merge pull request #6821 from spadgett/remove-asset-config
Remove old assetConfig from master-config.yaml
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/post_control_plane.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml | 6 |
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 |