Merge pull request openshift#3056 from rhcarvalho/cleanup-cluster-upg…

…rade Cleanup cluster upgrade
alex-berger · Jan 10, 2017 · 30a3189 · 30a3189
2 parents 39f18e9 + eab0e00
commit 30a3189
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 206 deletions.
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml
@@ -20,7 +20,7 @@
 - debug: var=docker_image_count.stdout
 
 - name: Remove all containers and images
-  script: nuke_images.sh docker
+  script: nuke_images.sh
   register: nuke_images_result
   when: docker_upgrade_nuke_images is defined and docker_upgrade_nuke_images | bool
 

diff --git a/playbooks/common/openshift-cluster/upgrades/files/pre-upgrade-check b/playbooks/common/openshift-cluster/upgrades/files/pre-upgrade-check
diff --git a/playbooks/common/openshift-cluster/upgrades/files/rpm_versions.sh b/playbooks/common/openshift-cluster/upgrades/files/rpm_versions.sh