diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-13 15:30:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-13 15:30:36 +0000 |
| commit | 086eb5fb2fd9b60788c79c33fced49021d509e6c (patch) | |
| tree | 500b7a3cdace6301ce674ff2cfa6c4b51bc5577d | |
| parent | ce23dbe14d45f746c7bf3ca14422760575ef9204 (diff) | |
| parent | d5fe8a30f98db9c604cf6a80b63875c06abbf20a (diff) | |
| download | kolla-086eb5fb2fd9b60788c79c33fced49021d509e6c.tar.gz kolla-086eb5fb2fd9b60788c79c33fced49021d509e6c.zip | |
Merge "Cleanup container script improvement"
| -rw-r--r-- | ansible/roles/destroy/tasks/cleanup_containers.yml | 9 | ||||
| -rwxr-xr-x | tools/cleanup-containers | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ansible/roles/destroy/tasks/cleanup_containers.yml b/ansible/roles/destroy/tasks/cleanup_containers.yml index 4ccdd9cdd..c6aee8ef5 100644 --- a/ansible/roles/destroy/tasks/cleanup_containers.yml +++ b/ansible/roles/destroy/tasks/cleanup_containers.yml @@ -1,3 +1,10 @@ --- -- name: Destroying all Kolla containers and volumes +- name: Destroying all Kolla containers and volumes on compute node + environment: + COMPUTE: true command: /tmp/kolla-cleanup/tools/cleanup-containers + when: inventory_hostname in groups['compute'] + +- name: Destroying all Kolla containers and volumes on non compute node + command: /tmp/kolla-cleanup/tools/cleanup-containers + when: inventory_hostname not in groups['compute'] diff --git a/tools/cleanup-containers b/tools/cleanup-containers index 14249c960..c73d197dd 100755 --- a/tools/cleanup-containers +++ b/tools/cleanup-containers @@ -1,5 +1,5 @@ #!/bin/bash -if [[ $(pgrep qemu) ]]; then +if [[ $COMPUTE ]] && [[ $(pgrep qemu) ]]; then echo "Some qemu processes were detected." echo "Docker will not be able to stop the nova_libvirt container with those running." echo "Please clean them up before rerunning this script." |