summaryrefslogtreecommitdiffstats
path: root/playbooks/adhoc
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-20 12:10:22 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-20 12:10:22 -0500
commit24f21d3115a1b25b93acef1d80509347117454c2 (patch)
tree07e8bcc1cb742f6642fa603dd27524e82ca98638 /playbooks/adhoc
parentbdcb7e6d7e072927f307a3da6f6399f3225d62b6 (diff)
parentdf74a04e92b267a711e69b26dd0c7cd5375797c9 (diff)
downloadopenshift-24f21d3115a1b25b93acef1d80509347117454c2.tar.gz
openshift-24f21d3115a1b25b93acef1d80509347117454c2.tar.bz2
openshift-24f21d3115a1b25b93acef1d80509347117454c2.tar.xz
openshift-24f21d3115a1b25b93acef1d80509347117454c2.zip
Merge pull request #938 from brenton/uninstall
Making the uninstall playbook more flexible
Diffstat (limited to 'playbooks/adhoc')
-rw-r--r--playbooks/adhoc/uninstall.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml
index 1a55eb053..538414508 100644
--- a/playbooks/adhoc/uninstall.yml
+++ b/playbooks/adhoc/uninstall.yml
@@ -111,12 +111,12 @@
- atomic-enterprise
- origin
- - shell: docker ps -a | grep Exited | grep "{{ item }}" | awk '{print $1}'
+ - shell: docker ps -a | grep Exited | egrep "{{ item }}" | awk '{print $1}'
changed_when: False
failed_when: False
register: exited_containers_to_delete
with_items:
- - aep3/aep
+ - aep3.*/aep
- openshift3/ose
- openshift/origin
@@ -125,13 +125,13 @@
failed_when: False
with_items: "{{ exited_containers_to_delete.results }}"
- - shell: docker images | grep {{ item }} | awk '{ print $3 }'
+ - shell: docker images | egrep {{ item }} | awk '{ print $3 }'
changed_when: False
failed_when: False
register: images_to_delete
with_items:
- - registry.access.redhat.com/openshift3
- - registry.access.redhat.com/aep3
+ - registry\.access\..*redhat\.com/openshift3
+ - registry\.access\..*redhat\.com/aep3
- docker.io/openshift
- shell: "docker rmi -f {{ item.stdout_lines | join(' ') }}"