summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-09-13 18:15:41 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-13 18:15:41 +0000
commit19d23f8ebd047a22229ccfad38f7a01be5766fec (patch)
tree2192f64c279a42c0c468632706e28cd2103d2c76 /ci
parentebed0b80aa6c55aa37e7eddf70d6b8ddf19ad65f (diff)
parent0d970ec91f5ff3a758fcba8c8b2a9d64ab20e593 (diff)
Merge "Adding new network settings clean"
Diffstat (limited to 'ci')
-rwxr-xr-xci/clean.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/ci/clean.sh b/ci/clean.sh
index e4b2d106..c00a4df2 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -30,8 +30,12 @@ for lib in common-functions parse-functions; do
done
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"
+ovs_bridges="br-admin br-tenant br-public br-storage"
+ovs_bridges+=" br-private br-external" # Legecy names, remove in E river
+
+#OPNFV_NETWORK_TYPES=$(python3 -c 'from apex.common.constants import OPNFV_NETWORK_TYPES; print(" ".join(OPNFV_NETWORK_TYPES))')
+OPNFV_NETWORK_TYPES+=" admin tenant external storage api"
+OPNFV_NETWORK_TYPES+=" admin_network private_network public_network storage_network api_network" # Legecy names, remove in E river
display_usage() {
@@ -75,7 +79,7 @@ parse_cmdline "$@"
if [ -n "$INVENTORY_FILE" ]; then
echo -e "${blue}INFO: Parsing inventory file...${reset}"
- if ! python3.4 -B $LIB/python/apex_python_utils.py clean -f ${INVENTORY_FILE}; then
+ if ! python3 -B $LIB/python/apex_python_utils.py clean -f ${INVENTORY_FILE}; then
echo -e "${red}WARN: Unable to shutdown all nodes! Please check /var/log/apex.log${reset}"
else
echo -e "${blue}INFO: Node shutdown complete...${reset}"