summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-15 12:18:04 -0500
committerGitHub <noreply@github.com>2017-02-15 12:18:04 -0500
commit67b714641c9d813290712f6b0cbd176432ca3225 (patch)
tree41d142802f12abcd5990b6ecc4d55deef7131b5d
parent410720d2468949d8c518f1c92801912769ed4225 (diff)
parent506b2df261c9224f3e6a8328edad5c6de5a12b66 (diff)
downloadopenshift-67b714641c9d813290712f6b0cbd176432ca3225.tar.gz
openshift-67b714641c9d813290712f6b0cbd176432ca3225.tar.bz2
openshift-67b714641c9d813290712f6b0cbd176432ca3225.tar.xz
openshift-67b714641c9d813290712f6b0cbd176432ca3225.zip
Merge pull request #3367 from soltysh/upgrade_jobs
Add upgrade job step after the entire upgrade performs
-rw-r--r--playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade.yml2
-rw-r--r--playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml2
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_5/storage_upgrade.yml19
3 files changed, 23 insertions, 0 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade.yml
index e55ab1b16..6a6f0952b 100644
--- a/playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade.yml
+++ b/playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade.yml
@@ -101,3 +101,5 @@
- include: ../../../../common/openshift-cluster/upgrades/upgrade_nodes.yml
- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml
+
+- inlcude: ../../../../common/openshift-cluster/upgrades/v3_5/storage_upgrade.yml
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml b/playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml
index e18b4280c..85894b371 100644
--- a/playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml
+++ b/playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml
@@ -104,3 +104,5 @@
- include: ../../../../common/openshift-cluster/upgrades/upgrade_control_plane.yml
- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml
+
+- inlcude: ../../../../common/openshift-cluster/upgrades/v3_5/storage_upgrade.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_5/storage_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_5/storage_upgrade.yml
new file mode 100644
index 000000000..3743f0f5d
--- /dev/null
+++ b/playbooks/common/openshift-cluster/upgrades/v3_5/storage_upgrade.yml
@@ -0,0 +1,19 @@
+---
+###############################################################################
+# 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
+