From 6ac7839a21e8870875d3a432fdaea90ac7224144 Mon Sep 17 00:00:00 2001 From: Shaun Smekel Date: Sun, 14 Feb 2016 23:04:13 +1100 Subject: [PATCH] Adds support for cleaning up bootstrap containers in the toos/cleanup-containers script. Dynamic Ceph OSD bootstrap containers also included. Change-Id: Ifb5b54c5b78a894ed6e8b9980a6eb9919e52364c Closes-Bug: #1515544 Signed-off-by: Shaun Smekel --- tools/cleanup-containers | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/cleanup-containers b/tools/cleanup-containers index d6ce4a2e1f..962a612510 100755 --- a/tools/cleanup-containers +++ b/tools/cleanup-containers @@ -10,6 +10,7 @@ if [ -n "$1" ]; then containers_to_kill=($(docker ps | grep -E "$1" | awk '{print $1}')) else containers_to_kill=( + bootstrap_{ceph_mon,cinder,glance,heat,ironic,ironic_pxe,keystone,magnum,mistral,mongodb,murano,neutron,nova,nova_compute} \ cinder_{volume,scheduler,backup,api} \ glance_{api,registry} \ haproxy \ @@ -23,15 +24,17 @@ else manila_{api,share,scheduler} \ mariadb \ memcached \ - mistral{api,engine,executor} \ + mistral_{api,engine,executor} \ murano_{api,engine} \ neutron_{server,dhcp_agent,l3_agent,linuxbridge_agent,metadata_agent,openvswitch_agent} \ nova_{scheduler,novncproxy,consoleauth,conductor,api,compute,libvirt,spicehtml5proxy,compute_ironic} \ openvswitch_{vswitchd,db} \ - rabbitmq \ + rabbitmq{,_bootstrap} \ rsyslog \ 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}" fi echo "Stopping containers..."