added the labconfig file for att virpod1. Remove the mac

[joid.git] / ci / 02-maasdeploy.sh

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 4aa9199..839d29f 100755 (executable)
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -67,7 +67,9 @@ else
             python deploy.py
             ;;
         'attvirpod1' )
-            cp maas/att/virpod1/deployment.yaml ./deployment.yaml
+            cp ../labconfig/att/virpod1/labconfig.yaml ./
+            #to be removed later once converted for all labs.
+            python deploy.py
             ;;
         'juniperpod1' )
             cp maas/juniper/pod1/deployment.yaml ./deployment.yaml
@@ -184,6 +186,10 @@ sed --i "s@qemu+ssh://ubuntu@qemu+ssh://$USER@g" ./deployment.yaml
 
 cp ./deployment.yaml ~/.juju/
 
+if [ -e ./deployconfig.yaml ]; then
+    cp ./deployconfig.yaml ~/.juju/
+fi
+
 sudo maas-deployer -c deployment.yaml -d --force
 
 sudo chown $USER:$USER environments.yaml
@@ -265,7 +271,7 @@ case "$labname" in
         enableautomode eth3 AUTO "192.168.12.0/24" || true
         ;;
     'attvirpod1' )
-        enableautomodebyname eth1 AUTO "192.168.10.0/24" control || true
+        enableautomode eth1 AUTO "192.168.10.0/24" || true
         ;;
     'juniperpod1' )
         ;;