diff options
| -rwxr-xr-x | ci/deploy.sh | 2 | ||||
| -rwxr-xr-x | ci/openstack.sh | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index c9994cca..dbe0ef97 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -170,7 +170,7 @@ check_status echo "...... deployment finished ......." -./openstack.sh "$opnfvsdn" "$opnfvdistro" "$openstack" || true +./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true sudo ../juju/get-cloud-images || true ../juju/joid-configure-openstack || true diff --git a/ci/openstack.sh b/ci/openstack.sh index fbfc7c06..2e1eb9e1 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -7,11 +7,12 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -#./openstack.sh "$opnfvsdn" "$opnfvdistro" "$openstack" +#./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true opnfvsdn=$1 -opnfvdistro=$2 -opnfvos=$3 +opnfvlab=$2 +opnfvdistro=$3 +opnfvos=$4 if [ -f ./deployconfig.yaml ];then EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 ` |