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/v3_5 | |
| 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/v3_5')
3 files changed, 0 insertions, 22 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_5/storage_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_5/storage_upgrade.yml deleted file mode 100644 index 48c69eccd..000000000 --- a/playbooks/common/openshift-cluster/upgrades/v3_5/storage_upgrade.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -############################################################################### -# Post upgrade - Upgrade job storage -############################################################################### -- name: Upgrade job storage - hosts: oo_first_master - roles: - - { role: openshift_cli } - vars: - # Another spot where we assume docker is running and do not want to accidentally trigger an unsafe - # restart. - skip_docker_role: True - tasks: - - name: Upgrade job storage - command: > - {{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig - migrate storage --include=jobs --confirm - run_once: true diff --git a/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml index e63b03e51..4e7c14e94 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml @@ -115,5 +115,3 @@ - include: ../upgrade_nodes.yml - include: ../post_control_plane.yml - -- include: storage_upgrade.yml diff --git a/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml index 74c2964aa..45b664d06 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml @@ -119,5 +119,3 @@ master_config_hook: "v3_5/master_config_upgrade.yml" - include: ../post_control_plane.yml - -- include: storage_upgrade.yml |