diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-07-03 13:59:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-03 13:59:51 -0400 |
| commit | ffb9854b1245120b571f637f072fac967082ed40 (patch) | |
| tree | 20ea9aaa7bd507a164d7f58ddabe72f2b2a74e62 /playbooks/common/openshift-cluster/upgrades | |
| parent | d5d909e592d465e3dc65f88778cc47e8f997fa45 (diff) | |
| parent | c4e546e0f17cf7972fdac01d23cbb6765880a25f (diff) | |
| download | openshift-ffb9854b1245120b571f637f072fac967082ed40.tar.gz openshift-ffb9854b1245120b571f637f072fac967082ed40.tar.bz2 openshift-ffb9854b1245120b571f637f072fac967082ed40.tar.xz openshift-ffb9854b1245120b571f637f072fac967082ed40.zip | |
Merge pull request #4533 from sdodson/storage-migration-fixes
Merged by openshift-bot
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index e7fc10af8..227fbf60a 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -5,13 +5,13 @@ # 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 +- name: Pre master upgrade - Upgrade all storage hosts: oo_first_master tasks: - - name: Upgrade job storage + - name: Upgrade all storage command: > {{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig - migrate storage --include=jobs --confirm + migrate storage --include=* --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 @@ -143,13 +143,13 @@ - set_fact: master_update_complete: True -- name: Post master upgrade - Upgrade job storage +- name: Post master upgrade - Upgrade clusterpolicies storage hosts: oo_first_master tasks: - - name: Upgrade job storage + - name: Upgrade clusterpolicies storage command: > {{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig - migrate storage --include=jobs --confirm + migrate storage --include=clusterpolicies --confirm ############################################################################## # Gate on master update complete @@ -230,6 +230,12 @@ - reconcile_scc_result.rc == 0 run_once: true + - name: Upgrade job storage + command: > + {{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig + migrate storage --include=* --confirm + run_once: true + - set_fact: reconcile_complete: True |