openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use alphabetical order in cleanup-containers"

Browse Source
This commit is contained in:
Jenkins 2016-03-05 15:36:50 +00:00 committed by Gerrit Code Review
commit 01b0be02b6
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/cleanup-containers
View File

@ -14,13 +14,16 @@ else
bootstrap_{ceph_mon,cinder,glance,heat,heka,ironic,ironic_pxe,keystone,magnum,mistral,mongodb,murano,neutron,nova,nova_compute} \ bootstrap_{ceph_mon,cinder,glance,heat,heka,ironic,ironic_pxe,keystone,magnum,mistral,mongodb,murano,neutron,nova,nova_compute} \
cinder_{volume,scheduler,backup,api} \ cinder_{volume,scheduler,backup,api} \
ceph_{mon,rgw} \ ceph_{mon,rgw} \
elasticsearch \
glance_{api,registry} \ glance_{api,registry} \
haproxy \ haproxy \
heat_{api{,_cfn},engine} \ heat_{api{,_cfn},engine} \
heka \
horizon \ horizon \
ironic_{inspector,conductor,api,pxe} \ ironic_{inspector,conductor,api,pxe} \
keepalived \ keepalived \
keystone \ keystone \
kibana \
kolla_toolbox \ kolla_toolbox \
magnum_{api,conductor} \ magnum_{api,conductor} \
manila_{api,share,scheduler} \ manila_{api,share,scheduler} \
@ -32,29 +35,26 @@ else
nova_{scheduler,novncproxy,consoleauth,conductor,api,compute,libvirt,spicehtml5proxy,compute_ironic} \ nova_{scheduler,novncproxy,consoleauth,conductor,api,compute,libvirt,spicehtml5proxy,compute_ironic} \
openvswitch_{vswitchd,db} \ openvswitch_{vswitchd,db} \
rabbitmq{,_bootstrap} \ rabbitmq{,_bootstrap} \
heka \ swift_{account_{auditor,reaper,replicator,server},container_{auditor,replicator,server,updater},object_{auditor,expirer,replicator,server,updater},proxy_server,rsyncd}
swift_{account_{auditor,reaper,replicator,server},container_{auditor,replicator,server,updater},object_{auditor,expirer,replicator,server,updater},proxy_server,rsyncd} \
elasticsearch \
kibana
) )
ceph_osd_bootstrap=$(docker ps -a --filter "name=bootstrap_osd_*" --format "{{.Names}}") ceph_osd_bootstrap=$(docker ps -a --filter "name=bootstrap_osd_*" --format "{{.Names}}")
ceph_osd_containers=$(docker ps -a --filter "name=ceph_osd_*" --format "{{.Names}}") ceph_osd_containers=$(docker ps -a --filter "name=ceph_osd_*" --format "{{.Names}}")
containers_to_kill="${containers_to_kill} ${ceph_osd_containers} ${ceph_osd_bootstrap}" containers_to_kill="${containers_to_kill} ${ceph_osd_containers} ${ceph_osd_bootstrap}"
volumes_to_remove=( volumes_to_remove=(
glance \
ironic_pxe \
mariadb \
openvswitch_db \
neutron_metadata_socket \
nova_{compute,libvirt} \
ceph_mon{,_config} \ ceph_mon{,_config} \
rabbitmq \ elasticsearch \
mongodb \ glance \
haproxy_socket \ haproxy_socket \
heka{,_socket} \ heka{,_socket} \
ironic_pxe \
kolla_logs \ kolla_logs \
elasticsearch mariadb \
mongodb \
neutron_metadata_socket \
nova_{compute,libvirt} \
openvswitch_db \
rabbitmq
) )
fi fi