Merge "Fix the remove mariadb volume failed"

This commit is contained in:
Jenkins 2017-04-24 12:53:52 +00:00 committed by Gerrit Code Review
commit 60b5b495a2

View File

@ -11,9 +11,9 @@ if [[ "${containers_running}" =~ "nova_libvirt" ]] && [[ $QEMU_PIDS ]] && [[ $(p
fi fi
if [ -n "$1" ]; then if [ -n "$1" ]; then
containers_to_kill=($(docker ps --filter "label=kolla_version" --format "{{.Names}}" -a | grep -E "$1" | awk '{print $1}')) containers_to_kill=$(docker ps --filter "label=kolla_version" --format "{{.Names}}" -a | grep -E "$1" | awk '{print $1}')
volumes_to_remove=($(docker inspect -f '{{range .Mounts}} {{printf "%s\n" .Name }}{{end}}' $1 | \ volumes_to_remove=$(docker inspect -f '{{range .Mounts}} {{printf "%s\n" .Name }}{{end}}' ${containers_to_kill} | \
egrep -v '(^\s*$)' | sort | uniq)) egrep -v '(^\s*$)' | sort | uniq)
else else
containers_to_kill=$(docker ps --filter "label=kolla_version" --format "{{.Names}}" -a) containers_to_kill=$(docker ps --filter "label=kolla_version" --format "{{.Names}}" -a)