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 .
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
# 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