diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-19 09:21:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 09:21:29 -0500 |
| commit | b3f0b74e6fd07d2148b896ef572ea4d9cd025371 (patch) | |
| tree | e0e13b66a6f6052ab641b5febad89e94e53e4fd8 /playbooks/common/openshift-cluster/upgrades | |
| parent | f185fa6ce66a25b8f44c81aa963e0c27e2742586 (diff) | |
| parent | 362a4eafc1ae9122f98adb5b96ad86ca39529c96 (diff) | |
| download | openshift-b3f0b74e6fd07d2148b896ef572ea4d9cd025371.tar.gz openshift-b3f0b74e6fd07d2148b896ef572ea4d9cd025371.tar.bz2 openshift-b3f0b74e6fd07d2148b896ef572ea4d9cd025371.tar.xz openshift-b3f0b74e6fd07d2148b896ef572ea4d9cd025371.zip | |
Merge pull request #3057 from dgoodwin/serial-master-upgrade
Serial master upgrade
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index 6950b6166..7f738ea0f 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -30,14 +30,6 @@ - name: Upgrade and backup etcd include: ./etcd/main.yml -- name: Upgrade master packages - hosts: oo_masters_to_config - roles: - - openshift_facts - tasks: - - include: rpm_upgrade.yml component=master - when: not openshift.common.is_containerized | bool - # Create service signer cert when missing. Service signer certificate # is added to master config in the master config hook for v3_3. - name: Determine if service signer cert must be created @@ -59,14 +51,20 @@ roles: - openshift_master_facts -- name: Upgrade master config and systemd units +- name: Upgrade master hosts: oo_masters_to_config + vars: + openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}" + serial: 1 handlers: - include: ../../../../roles/openshift_master/handlers/main.yml static: yes roles: - openshift_facts post_tasks: + - include: rpm_upgrade.yml component=master + when: not openshift.common.is_containerized | bool + - include_vars: ../../../../roles/openshift_master_facts/vars/main.yml - include: upgrade_scheduler.yml @@ -104,9 +102,12 @@ state: link when: ca_crt_stat.stat.isreg and not ca_bundle_stat.stat.exists -- name: Set master update status to complete - hosts: oo_masters_to_config - tasks: + - include: ../../openshift-master/restart_hosts.yml + when: openshift.common.rolling_restart_mode == 'system' + + - include: ../../openshift-master/restart_services.yml + when: openshift.common.rolling_restart_mode == 'services' + - set_fact: master_update_complete: True @@ -128,10 +129,6 @@ msg: "Upgrade cannot continue. The following masters did not finish updating: {{ master_update_failed | join(',') }}" when: master_update_failed | length > 0 -# We are now ready to restart master services (or entire system -# depending on openshift_rolling_restart_mode): -- include: ../../openshift-master/restart.yml - ############################################################################### # Reconcile Cluster Roles, Cluster Role Bindings and Security Context Constraints ############################################################################### |