diff options
| -rw-r--r-- | jjb/joid/joid-deploy.sh | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index da5dcf043..e197dbd8c 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 . @@ -150,21 +150,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 |