summaryrefslogtreecommitdiffstats
path: root/playbooks/adhoc
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-28 08:52:20 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-28 08:52:20 -0300
commitdd2506e325d1a2858da353f96251f093e94bbcf3 (patch)
tree132ea0fd3eb8eb707ae396a7e1cbe7abea21e418 /playbooks/adhoc
parentf004b526078b78b0ba9435b82af4d4f4d42de5e2 (diff)
parentbf520e46e6916a4c9995ea95fa40cdd25f31209e (diff)
downloadopenshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.gz
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.bz2
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.xz
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.zip
Merge branch 'master' into upgrade33
Diffstat (limited to 'playbooks/adhoc')
-rw-r--r--playbooks/adhoc/uninstall.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml
index 3d6de2d17..4edd44fe4 100644
--- a/playbooks/adhoc/uninstall.yml
+++ b/playbooks/adhoc/uninstall.yml
@@ -143,11 +143,13 @@
- registry\.qe\.openshift\.com/.*
- registry\.access\..*redhat\.com/rhel7/etcd
- docker.io/openshift
+ when: openshift_uninstall_images | default(True) | bool
- shell: "docker rmi -f {{ item.stdout_lines | join(' ') }}"
changed_when: False
failed_when: False
with_items: "{{ images_to_delete.results }}"
+ when: openshift_uninstall_images | default(True) | bool
- name: Remove sdn drop files
file: