X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjoid%2Fjoid-deploy.sh;h=9740d38bf04cb27371979bc3c37855e268dd2db6;hb=96745713cb9a9b377254050902ca196aa41bc8a5;hp=da5dcf043ef5083019ec1d6010f3199ee14ff0d6;hpb=bcc1c0a7d2a8dc9d5771e080ad727b137b45943c;p=releng.git

diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index da5dcf043..9740d38bf 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -48,7 +48,7 @@ cd $WORKSPACE/ci
 
 if [ -e "$LAB_CONFIG/deployconfig.yaml" ] && [ "$MAAS_REINSTALL" == "false" ]; then
     echo "------ Recover Juju environment to use MAAS ------"
-    if [ -e deployconfig.yaml ]; then
+    if [ ! -e deployconfig.yaml ]; then
         cp $LAB_CONFIG/deployconfig.yaml .
         cp $LAB_CONFIG/deployment.yaml .
         cp $LAB_CONFIG/labconfig.yaml .
@@ -94,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
@@ -150,21 +147,8 @@ 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
+  echo export SDN_CONTROLLER=$SDN_CONTROLLER_IP >> $JOID_ADMIN_OPENRC
+  echo export SDN_PASSWORD=$SDN_PASSWORD >> $JOID_ADMIN_OPENRC
 
 fi