add server_option in haproxy configuration

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

diff --git a/ci/00-maasdeploy.sh b/ci/00-maasdeploy.sh
index 8b8a8d4..0dfff05 100755 (executable)
--- a/ci/00-maasdeploy.sh
+++ b/ci/00-maasdeploy.sh
@@ -31,14 +31,14 @@ labfile=$2
 case "$labname" in
     intelpod[569]|orangepod[12]|cengnpod[12] )
         array=(${labname//pod/ })
-        cp maas/${array[0]}/pod${array[0]}/labconfig.yaml .
-        python genDeploymentConfig.py > deployment.yaml
-        python genMAASConfig.py > deployconfig.yaml
+        cp ../labconfig/${array[0]}/pod${array[1]}/labconfig.yaml .
+        python genMAASConfig.py -l labconfig.yaml > deployment.yaml
+        python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml
         ;;
     'attvirpod1' )
-        cp maas/att/virpod1/labconfig.yaml .
-        python genDeploymentConfig.py > deployment.yaml
-        python genMAASConfig.py > deployconfig.yaml
+        cp ../labconfig/att/virpod1/labconfig.yaml .
+        python genMAASConfig.py -l labconfig.yaml > deployment.yaml
+        python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml
         ;;
     'juniperpod1' )
         cp maas/juniper/pod1/deployment.yaml ./deployment.yaml
@@ -56,8 +56,8 @@ case "$labname" in
         if [ ! -e ./labconfig.yaml ]; then
             virtinstall=1
         else
-            python genDeploymentConfig.py > deployment.yaml
-            python genMAASConfig.py > deployconfig.yaml
+            python genMAASConfig.py -l labconfig.yaml > deployment.yaml
+            python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml
             labname=`grep "maas_name" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
         fi
         ;;
@@ -139,13 +139,6 @@ fi
 # Init Juju
 juju init -f
 
-# Backup deployment.yaml and deployconfig.yaml in .juju folder
-cp ./deployment.yaml ~/.juju/
-
-if [ -e ./deployconfig.yaml ]; then
-    cp ./deployconfig.yaml ~/.juju/
-fi
-
 #
 # MAAS deploy
 #
@@ -156,6 +149,15 @@ sudo chown $USER:$USER environments.yaml
 
 echo "... Deployment of maas finish ...."
 
+# Backup deployment.yaml and deployconfig.yaml in .juju folder
+
+cp ./environments.yaml ~/.juju/
+
+if [ -e ./deployconfig.yaml ]; then
+    cp ./deployconfig.yaml ~/.juju/
+    cp ./labconfig.yaml ~/.juju/
+fi
+
 #
 # MAAS Customization
 #
@@ -221,7 +223,7 @@ enableautomodebyname() {
     if [ ! -z "$4" ]; then
         for i in `seq 1 7`;
         do
-            nodes=`maas maas nodes list hostname=node$i-$4 | grep system_id | cut -d '"' -f 4`
+            nodes=`maas maas nodes list | grep system_id | cut -d '"' -f 4`
             if [ ! -z "$nodes" ]; then
                 maas maas interface link-subnet $nodes $1  mode=$2 subnet=$3
             fi
@@ -255,14 +257,14 @@ crnodevlanint() {
 case "$labname" in
     'intelpod9' )
         maas refresh
-        crvlanupdsubnet vlan902 1 "DataNetwork" 902 2 || true
-        crvlanupdsubnet vlan905 2 "PublicNetwork" 905 3 || true
-        crnodevlanint $vlan902 eth0 || true
+        crvlanupdsubnet vlan904 fabric-1 "MgmtNetwork" 904 2 || true
+        crvlanupdsubnet vlan905 fabric-2 "PublicNetwork" 905 3 || true
         crnodevlanint $vlan905 eth1 || true
-        enableautomodebyname eth0.902 AUTO "10.9.12.0/24" compute || true
-        enableautomodebyname eth1.905 AUTO "10.9.15.0/24" compute || true
-        enableautomodebyname eth0.902 AUTO "10.9.12.0/24" control || true
-        enableautomodebyname eth1.905 AUTO "10.9.15.0/24" control || true
+        crnodevlanint $vlan905 eth3 || true
+        enableautomodebyname eth1.905 AUTO "10.9.15.0/24" || true
+        enableautomodebyname eth3.905 AUTO "10.9.15.0/24" || true
+        enableautomodebyname eth0 AUTO "10.9.12.0/24" || true
+        enableautomodebyname eth2 AUTO "10.9.12.0/24" || true
         ;;
 esac