summaryrefslogtreecommitdiffstats
path: root/ci/deploy.sh
diff options
context:
space:
mode:
Diffstat (limited to 'ci/deploy.sh')
-rwxr-xr-xci/deploy.sh19
1 files changed, 10 insertions, 9 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 48c0d6e6..15f6e476 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -65,14 +65,6 @@ while getopts ":s:t:o:l:h:r:f:d:a:" opt; do
esac
done
-deploy_dep() {
- sudo apt-add-repository ppa:juju/stable -y
- sudo apt-get update
- sudo apt-get install juju git juju-deployer -y
- juju init -f
- cp environments.yaml ~/.juju/
-}
-
#by default maas creates two VMs in case of three more VM needed.
createresource() {
maas_ip=`grep " ip_address" deployment.yaml | cut -d " " -f 10`
@@ -109,15 +101,23 @@ deploy() {
if [ ! -f ./environments.yaml ] && [ -e ~/.juju/environments.yaml ]; then
cp ~/.juju/environments.yaml ./environments.yaml
+ elif [ ! -f ./environments.yaml ] && [ -e ~/joid_config/environments.yaml ]; then
+ cp ~/joid_config/environments.yaml ./environments.yaml
fi
if [ ! -f ./deployment.yaml ] && [ -e ~/.juju/deployment.yaml ]; then
cp ~/.juju/deployment.yaml ./deployment.yaml
+ elif [ ! -f ./deployment.yaml ] && [ -e ~/joid_config/deployment.yaml ]; then
+ cp ~/joid_config/deployment.yaml ./deployment.yaml
fi
if [ ! -f ./labconfig.yaml ] && [ -e ~/.juju/labconfig.yaml ]; then
cp ~/.juju/labconfig.yaml ./labconfig.yaml
+ elif [ ! -f ./labconfig.yaml ] && [ -e ~/joid_config/labconfig.yaml ]; then
+ cp ~/joid_config/labconfig.yaml ./labconfig.yaml
fi
if [ ! -f ./deployconfig.yaml ] && [ -e ~/.juju/deployconfig.yaml ]; then
cp ~/.juju/deployconfig.yaml ./deployconfig.yaml
+ elif [ ! -f ./deployconfig.yaml ] && [ -e ~/joid_config/deployconfig.yaml ]; then
+ cp ~/joid_config/deployconfig.yaml ./deployconfig.yaml
fi
#copy the script which needs to get deployed as part of ofnfv release
@@ -129,6 +129,7 @@ deploy() {
echo " default-series: $opnfvdistro" >> environments.yaml
cp environments.yaml ~/.juju/
+ cp environments.yaml ~/joid_config/
if [[ "$opnfvtype" = "ha" && "$opnfvlab" = "default" ]]; then
createresource
@@ -150,7 +151,7 @@ check_status() {
juju status > status.txt
if [ "$(grep -c "executing" status.txt )" -ge 1 ]; then
echo " still executing the reltionship within charms ..."
- if [ $timeoutiter -ge 90 ]; then
+ if [ $timeoutiter -ge 120 ]; then
retval=1
fi
timeoutiter=$((timeoutiter+1))