refactor the cleanup containers

TrivialFix
Sort the containers, remove *_data ones, etc.

Change-Id: Ic7923828517da954e7c8802d6cf5918e425df255

1 files changed, 10 insertions, 10 deletions

diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index 1cf3b9f75..594e3731b 100755
--- a/tools/cleanup-containers
+++ b/tools/cleanup-containers
@@ -10,26 +10,26 @@ if [ -n "$1" ]; then
     containers_to_kill=($(docker ps | grep -E "$1" | awk '{print $1}'))
 else
     containers_to_kill=(
-        glance_{api,registry,data} \
+        cinder_{volume,scheduler,backup,api} \
+        glance_{api,registry} \
         haproxy \
         heat_{api{,_cfn},engine} \
         horizon \
-        keepalived
+        ironic-{discoverd,conductor,api,pxe} \
+        keepalived \
         keystone \
         kolla_ansible \
-        log_data \
         magnum_{api,conductor} \
-        mariadb{,_data} \
+        mariadb \
+        memcached \
+        mistral{api,engine,executor} \
         murano_{api,engine} \
         neutron_{server,agents,linuxbridge_agent,openvswitch_agent} \
-        nova_{data,scheduler,novncproxy,consoleauth,conductor,api,compute,libvirt} \
-        openvswitch_{vswitchd,db,data} \
+        nova_{scheduler,novncproxy,consoleauth,conductor,api,compute,libvirt,spicehtml5proxy,compute_ironic} \
+        openvswitch_{vswitchd,db} \
         rabbitmq{,_data} \
         rsyslog \
-        swift_{account_{auditor,reaper,replicator,server},container_{auditor,expirer,replicator,server,updater},proxy_server,rsyncd} \
-        memcached \
-        cinder_{volume,scheduler,backup,api} \
-        ironic-{discoverd,conductor,api,pxe}
+        swift_{account_{auditor,reaper,replicator,server},container_{auditor,replicator,server,updater},object_{auditor,expirer,replicator,server,updater},proxy_server,rsyncd}
     )
 fi