Code Review
/
apex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adds NSDriver to Neutron agent drivers
[apex.git]
/
ci
/
clean.sh
diff --git
a/ci/clean.sh
b/ci/clean.sh
index
4209006
..
4cf6b64
100755
(executable)
--- a/
ci/clean.sh
+++ b/
ci/clean.sh
@@
-14,12
+14,18
@@
# Use default if no param passed
CONFIG=${CONFIG:-'/var/opt/opnfv'}
# Use default if no param passed
CONFIG=${CONFIG:-'/var/opt/opnfv'}
+RESOURCES=${RESOURCES:-"$CONFIG/images"}
+LIB=${LIB:-"$CONFIG/lib"}
##LIBRARIES
##LIBRARIES
-source $CONFIG/lib/common-functions.sh
+if ! source $LIB/common-functions.sh; then
+ echo "Failed to source $LIB/common-functions.sh"
+ exit 1
+fi
vm_index=4
ovs_bridges="br-admin br-private br-public br-storage"
vm_index=4
ovs_bridges="br-admin br-private br-public br-storage"
+OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_network api_network"
# Clean off instack/undercloud VM
for vm in instack undercloud; do
# Clean off instack/undercloud VM
for vm in instack undercloud; do
@@
-39,12
+45,16
@@
for i in $(seq 0 $vm_index); do
rm -f /var/lib/libvirt/images/baremetal${i}.qcow2 2> /dev/null
done
rm -f /var/lib/libvirt/images/baremetal${i}.qcow2 2> /dev/null
done
+for network in ${OPNFV_NETWORK_TYPES}; do
+ virsh net-destroy ${network} 2> /dev/null
+ virsh net-undefine ${network} 2> /dev/null
+done
+
# Clean off created bridges
for bridge in ${ovs_bridges}; do
# Clean off created bridges
for bridge in ${ovs_bridges}; do
- virsh net-destroy ${bridge} 2> /dev/null | xargs echo -n
- virsh net-undefine ${bridge} 2> /dev/null | xargs echo -n
if detach_interface_from_ovs ${bridge} 2> /dev/null; then
ovs-vsctl del-br ${bridge} 2> /dev/null
if detach_interface_from_ovs ${bridge} 2> /dev/null; then
ovs-vsctl del-br ${bridge} 2> /dev/null
+ rm -f /etc/sysconfig/network-scripts/ifcfg-${bridge}
fi
done
fi
done
@@
-56,4
+66,7
@@
sed -i '/virtual-power-key/d' /root/.ssh/authorized_keys
# force storage cleanup
virsh pool-refresh default
# force storage cleanup
virsh pool-refresh default
+# remove temporary files
+rm -f /tmp/network-environment.yaml
+
echo "Cleanup Completed"
echo "Cleanup Completed"