diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-18 21:13:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-18 21:13:36 -0400 |
| commit | 9545204f504f1dcf3de18272dc1fb951dd15f486 (patch) | |
| tree | 0a04373bef53a80a873bf221cd29de6efe2a612a /playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | |
| parent | d7be27f7f9321099e52b54afcce2308ac1e1671f (diff) | |
| parent | ff1d1ee8d6bc87c196f28b241fef3710f92b819c (diff) | |
| download | openshift-9545204f504f1dcf3de18272dc1fb951dd15f486.tar.gz openshift-9545204f504f1dcf3de18272dc1fb951dd15f486.tar.bz2 openshift-9545204f504f1dcf3de18272dc1fb951dd15f486.tar.xz openshift-9545204f504f1dcf3de18272dc1fb951dd15f486.zip | |
Merge pull request #4476 from mtnbikenc/storage-upgrade
Run storage upgrade pre and post master upgrade
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 18 |
1 files changed, 18 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 b980909eb..bb294cc57 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -3,6 +3,16 @@ # Upgrade Masters ############################################################################### +# oc adm migrate storage should be run prior to etcd v3 upgrade +# See: https://github.com/openshift/origin/pull/14625#issuecomment-308467060 +- name: Pre master upgrade - Upgrade job storage + hosts: oo_first_master + tasks: + - name: Upgrade job storage + command: > + {{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig + migrate storage --confirm + # If facts cache were for some reason deleted, this fact may not be set, and if not set # it will always default to true. This causes problems for the etcd data dir fact detection # so we must first make sure this is set correctly before attempting the backup. @@ -133,6 +143,14 @@ - set_fact: master_update_complete: True +- name: Post master upgrade - Upgrade job storage + hosts: oo_first_master + tasks: + - name: Upgrade job storage + command: > + {{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig + migrate storage --confirm + ############################################################################## # Gate on master update complete ############################################################################## |