From 69fcd9450b35aede25442c4f4dd2b11ff34c2147 Mon Sep 17 00:00:00 2001 From: Di Xu Date: Mon, 17 Jul 2017 16:52:31 +0800 Subject: [PATCH] cleanup old controllers and models for virtual deployments Change-Id: I47d2085345820e404f300c2a935c477988b4132a Signed-off-by: Di Xu --- ci/deploy.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ci/deploy.sh b/ci/deploy.sh index 207482e2..1ffa7dab 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -14,6 +14,7 @@ opnfvfeature=none opnfvdistro=xenial opnfvarch=amd64 opnfvmodel=openstack +virtinstall=0 jujuver=`juju --version` @@ -33,9 +34,10 @@ usage() { echo "Usage: $0 [-s ] [-d ] [-a ] [-m ] + [-i <0|1>] [-r ]" 1>&2 exit 1; } -while getopts ":s:t:o:l:h:r:f:d:a:m:" opt; do +while getopts ":s:t:o:l:h:r:f:d:a:m:i:" opt; do case "${opt}" in s) opnfvsdn=${OPTARG} @@ -64,6 +66,9 @@ while getopts ":s:t:o:l:h:r:f:d:a:m:" opt; do m) opnfvmodel=${OPTARG} ;; + i) + virtinstall=${OPTARG} + ;; h) usage ;; @@ -201,6 +206,11 @@ check_status() { echo "...... deployment finishing ......." } +# In the case of a virtual deployment +if [ "$virtinstall" -eq 1 ]; then + ./clean.sh || true +fi + echo "...... deployment started ......" deploy -- 2.16.6