modified to download both trusty and xenial images.

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

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index cc41ecf..3396fdc 100755 (executable)
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -11,6 +11,9 @@ case "$1" in
     'intelpod6' )
         cp maas/intel/pod6/deployment.yaml ./deployment.yaml
         ;;
+    'intelpod9' )
+        cp maas/intel/pod9/deployment.yaml ./deployment.yaml
+        ;;
     'orangepod1' )
         cp maas/orange/pod1/deployment.yaml ./deployment.yaml
         ;;
@@ -152,8 +155,6 @@ maas_ip=`grep " ip_address" deployment.yaml | cut -d " "  -f 10`
 apikey=`grep maas-oauth: environments.yaml | cut -d "'" -f 2`
 maas login maas http://${maas_ip}/MAAS/api/1.0 ${apikey}
 maas maas boot-source update 1 url="http://maas.ubuntu.com/images/ephemeral-v2/daily/"
-#maas maas boot-source-selections create 1 os="ubuntu" release="precise" arches="amd64" subarches="*" labels="*"
-maas maas node-groups import-boot-images
 maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`"
 
 #Added the Qtip public to run the Qtip test after install on bare metal nodes.
@@ -204,6 +205,18 @@ case "$1" in
         enableautomodebyname eth4 AUTO "10.6.12.0/24" compute || true
         enableautomodebyname eth4 AUTO "10.6.12.0/24" control || true
         ;;
+    'intelpod9' )
+        maas refresh
+        enableautomodebyname eth4 AUTO "10.9.12.0/24" compute || true
+        enableautomodebyname eth4 AUTO "10.9.12.0/24" control || true
+        ;;
+    'orangepod1' )
+        maas refresh
+        enableautomodebyname eth2 DHCP "192.168.21.0/24" compute || true
+        enableautomodebyname eth3 AUTO "192.168.11.0/24" compute || true
+        enableautomodebyname eth2 DHCP "192.168.21.0/24" control || true
+        enableautomodebyname eth3 AUTO "192.168.11.0/24" control || true
+        ;;
     'orangepod2' )
         maas refresh
         enableautomodebyname eth4 DHCP "192.168.22.0/24" compute || true