diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-01 14:16:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-01 14:16:04 +0000 |
| commit | 76c28f96984d864cb05191d24f9d74c165b6d16f (patch) | |
| tree | d9e5f7dc7b531beec10982d20ce57b47b27a4583 | |
| parent | 3aedf52489ed5bc68e43899ca21dae13fc2b5100 (diff) | |
| parent | f1b8eec20dfe3bd7a9cec8ac6107eff71ff8bc80 (diff) | |
| download | kolla-76c28f96984d864cb05191d24f9d74c165b6d16f.tar.gz kolla-76c28f96984d864cb05191d24f9d74c165b6d16f.zip | |
Merge "Update cleanup-containers to remove ceph containers"
| -rwxr-xr-x | tools/cleanup-containers | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/cleanup-containers b/tools/cleanup-containers index a69adfe53..b5821d43e 100755 --- a/tools/cleanup-containers +++ b/tools/cleanup-containers @@ -13,6 +13,7 @@ else containers_to_kill=( bootstrap_{ceph_mon,cinder,glance,heat,heka,ironic,ironic_pxe,keystone,magnum,mistral,mongodb,murano,neutron,nova,nova_compute} \ cinder_{volume,scheduler,backup,api} \ + ceph_{mon,rgw} \ glance_{api,registry} \ haproxy \ heat_{api{,_cfn},engine} \ @@ -35,7 +36,8 @@ else swift_{account_{auditor,reaper,replicator,server},container_{auditor,replicator,server,updater},object_{auditor,expirer,replicator,server,updater},proxy_server,rsyncd} ) ceph_osd_bootstrap=$(docker ps -a --filter "name=bootstrap_osd_*" --format "{{.Names}}") - containers_to_kill="${containers_to_kill} ${ceph_osd_bootstrap}" + ceph_osd_containers=$(docker ps -a --filter "name=ceph_osd_*" --format "{{.Names}}") + containers_to_kill="${containers_to_kill} ${ceph_osd_containers} ${ceph_osd_bootstrap}" volumes_to_remove=( glance \ |