diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-02 10:01:38 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 10:01:38 -0800 |
| commit | e999558b8994488f2a6f47a4057d2deea4be1a22 (patch) | |
| tree | 030380709124d2c1f2490f350a5c874c7cef8644 /playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | |
| parent | da68f1366687b566f25cda1102a3556df2f49178 (diff) | |
| parent | 0fad99cb1c15212ddf6eb6d3862b4ded0b614166 (diff) | |
| download | openshift-e999558b8994488f2a6f47a4057d2deea4be1a22.tar.gz openshift-e999558b8994488f2a6f47a4057d2deea4be1a22.tar.bz2 openshift-e999558b8994488f2a6f47a4057d2deea4be1a22.tar.xz openshift-e999558b8994488f2a6f47a4057d2deea4be1a22.zip | |
Merge pull request #6958 from vrutkovs/rework-full-upgrade
Automatic merge from submit-queue.
Upgrade playbook improvements
Two changes in this PR:
* Avoid duplication in upgrade.yml - it now would simply run upgrade_control_plane and upgrade_nodes playbooks
* Restart controllers instead of start/stop if restart mode is 'services'
* For 'system' restart mode controllers are disabled before master upgrade and re-enabled after upgrades are finished
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index c27118f6f..1dcd9a207 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -94,6 +94,12 @@ - include_tasks: "{{ openshift_master_upgrade_hook }}" when: openshift_master_upgrade_hook is defined + - name: Disable master controller + service: + name: "{{ openshift_service_type }}-master-controllers" + enabled: false + when: openshift.common.rolling_restart_mode == 'system' + - include_tasks: ../../../openshift-master/private/tasks/restart_hosts.yml when: openshift.common.rolling_restart_mode == 'system' |