diff options
| -rwxr-xr-x | ci/02-deploybundle.sh | 8 | ||||
| -rwxr-xr-x | ci/deploy.sh | 8 | ||||
| -rwxr-xr-x | ci/openstack.sh | 20 |
3 files changed, 23 insertions, 13 deletions
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh index 8a0502d9..9242ebba 100755 --- a/ci/02-deploybundle.sh +++ b/ci/02-deploybundle.sh @@ -42,11 +42,9 @@ check_status() { } #read the value from deployment.yaml -if [ -e ~/.juju/deployment.yaml ]; then - cp ~/.juju/deployment.yaml ./deployment.yaml - if [ -e ~/.juju/deployconfig.yaml ]; then - cp ~/.juju/deployconfig.yaml ./deployconfig.yaml - cp ~/.juju/labconfig.yaml ./labconfig.yaml + +if [ -e ./deployment.yaml ]; then + if [ -e ./deployconfig.yaml ]; then extport=`grep "ext-port" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '` datanet=`grep "dataNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'` admnet=`grep "admNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'` diff --git a/ci/deploy.sh b/ci/deploy.sh index 1dab85d8..dbe0ef97 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -110,6 +110,12 @@ deploy() { if [ ! -f ./environments.yaml ] && [ -e ~/.juju/environments.yaml ]; then cp ~/.juju/environments.yaml ./environments.yaml fi + if [ ! -f ./labconfig.yaml ] && [ -e ~/.juju/labconfig.yaml ]; then + cp ~/.juju/labconfig.yaml ./labconfig.yaml + fi + if [ ! -f ./deployconfig.yaml ] && [ -e ~/.juju/deployconfig.yaml ]; then + cp ~/.juju/deployconfig.yaml ./deployconfig.yaml + fi #copy the script which needs to get deployed as part of ofnfv release echo "...... deploying now ......" @@ -164,7 +170,7 @@ check_status echo "...... deployment finished ......." -./openstack.sh "$opnfvsdn" "$opnfvlab" || 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 08f1548e..2e1eb9e1 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -7,8 +7,12 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -opnfvlab=$2 +#./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true + opnfvsdn=$1 +opnfvlab=$2 +opnfvdistro=$3 +opnfvos=$4 if [ -f ./deployconfig.yaml ];then EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 ` @@ -128,12 +132,14 @@ create_openrc echo "...... deploy public api proxy ......" if [ "$opnfvlab" == "orangepod1" ] && [ "$opnfvsdn" == "nosdn" ]; then # only for first test phase - PUB_API_NET=$(grep floating-ip-range ./labconfig.yaml |cut -d/ -f2) - PUB_API_IP=$(grep public-api-ip ./labconfig.yaml |cut -d: -f2) - juju run --unit nodes/0 "sudo ip a a ${PUB_API_IP}/${PUB_API_NET} dev br-ex" || true - juju run --unit nodes/0 "sudo ip l set dev br-ex up" || true - python genPublicAPIProxyBundle.py -l labconfig.yaml >> bundles.yaml - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$openstack" || true + if [ -e ./labconfig.yaml ]; then + PUB_API_NET=$(grep floating-ip-range ./labconfig.yaml |cut -d/ -f2) + PUB_API_IP=$(grep public-api-ip ./labconfig.yaml |cut -d: -f2) + juju run --unit nodes/0 "sudo ip a a ${PUB_API_IP}/${PUB_API_NET} dev br-ex" || true + juju run --unit nodes/0 "sudo ip l set dev br-ex up" || true + python genPublicAPIProxyBundle.py -l labconfig.yaml >> bundles.yaml + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$opnfvos" || true + fi fi echo "...... deploy end public api proxy ......" |