Code Review
/
fuel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
98ba528
)
[lib.sh] Stop Fuel@OPNFV containers if present
23/62423/1
author
Alexandru Avadanii
<Alexandru.Avadanii@enea.com>
Mon, 17 Sep 2018 13:48:52 +0000
(15:48 +0200)
committer
Alexandru Avadanii
<Alexandru.Avadanii@enea.com>
Mon, 17 Sep 2018 13:48:52 +0000
(15:48 +0200)
JIRA: FUEL-388
Change-Id: I6a7286bb9fc0243ab4a89292e34059fc85a831c4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
mcp/scripts/lib.sh
patch
|
blob
|
history
diff --git
a/mcp/scripts/lib.sh
b/mcp/scripts/lib.sh
index
ce5db25
..
e7720d6
100644
(file)
--- a/
mcp/scripts/lib.sh
+++ b/
mcp/scripts/lib.sh
@@
-245,6
+245,10
@@
function cleanup_vms {
xargs --no-run-if-empty -I{} sudo rm -f {}
virsh undefine "${node}" --remove-all-storage --nvram
done
+ # Newer Fuel@OPNFV releases run containers that conflict with the infra VMs
+ if which docker > /dev/null 2>&1; then
+ docker ps -a -q --filter="name=fuel" | xargs --no-run-if-empty docker stop
+ fi
}
function prepare_vms {