X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjoid%2Fjoid-deploy.sh;h=9740d38bf04cb27371979bc3c37855e268dd2db6;hb=3f1e2277ff6b96564fff31b541f842b2dea05362;hp=88dbe2214988fe05ad86b9a3029e047cc49baad6;hpb=3de608422cffacc90d80e479538b91e90874e242;p=releng.git

diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 88dbe2214..9740d38bf 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -45,17 +45,24 @@ export POD_NAME=${POD/-}
 ##
 
 cd $WORKSPACE/ci
-if [ -e "$LAB_CONFIG/environments.yaml" ] && [ "$MAAS_REINSTALL" == "false" ]; then
+
+if [ -e "$LAB_CONFIG/deployconfig.yaml" ] && [ "$MAAS_REINSTALL" == "false" ]; then
     echo "------ Recover Juju environment to use MAAS ------"
-    cp $LAB_CONFIG/environments.yaml .
-    cp $LAB_CONFIG/deployment.yaml .
-    if [ -e $LAB_CONFIG/deployconfig.yaml ]; then
+    if [ ! -e deployconfig.yaml ]; then
         cp $LAB_CONFIG/deployconfig.yaml .
+        cp $LAB_CONFIG/deployment.yaml .
+        cp $LAB_CONFIG/labconfig.yaml .
     fi
 else
-    echo "------ Redeploy MAAS ------"
-    ./00-maasdeploy.sh $POD_NAME
-    exit_on_error $? "MAAS Deploy FAILED"
+    if ["$NODE_NAME" == "default" ]; then
+        echo "------ Redeploy MAAS ------"
+        ./03-maasdeploy.sh default
+        exit_on_error $? "MAAS Deploy FAILED"
+    else
+        echo "------ Redeploy MAAS ------"
+        ./03-maasdeploy.sh custom $LAB_CONFIG/labconfig.yaml
+        exit_on_error $? "MAAS Deploy FAILED"
+    fi
 fi
 
 ##
@@ -87,9 +94,6 @@ EXTRA=${DEPLOY_OPTIONS[4]}
 if [ "$SDN_CONTROLLER" == 'odl_l2' ] || [ "$SDN_CONTROLLER" == 'odl_l3' ]; then
     SDN_CONTROLLER='odl'
 fi
-if [ "$HA_MODE" == 'noha' ]; then
-    HA_MODE='nonha'
-fi
 
 # Add extra to features
 if [ "$EXTRA" != "" ];then
@@ -142,22 +146,9 @@ if [ "$JOID_MODEL" == 'os' ]; then
 
   # export the openrc file by getting the one generated by joid and add SDN
   # controller for Functest
-  cp ./cloud/admin-openrc $JOID_ADMIN_OPENRC
-  cat << EOF >> $JOID_ADMIN_OPENRC
-  export SDN_CONTROLLER=$SDN_CONTROLLER_IP
-  export SDN_PASSWORD=$SDN_PASSWORD
-  EOF
-
-  ##
-  ## Backup local juju env
-  ##
-
-  echo "------ Backup Juju environment ------"
-  cp environments.yaml $LAB_CONFIG/
-  cp deployment.yaml $LAB_CONFIG/
-  if [ -e deployconfig.yaml ]; then
-      cp deployconfig.yaml $LAB_CONFIG
-  fi
+  # cp ./cloud/admin-openrc $JOID_ADMIN_OPENRC
+  echo export SDN_CONTROLLER=$SDN_CONTROLLER_IP >> $JOID_ADMIN_OPENRC
+  echo export SDN_PASSWORD=$SDN_PASSWORD >> $JOID_ADMIN_OPENRC
 
 fi