trying upgrade again.

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

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 72c2c61..08de4dc 100755 (executable)
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -23,6 +23,9 @@ case "$1" in
     'cengnlynxpod1' )
         cp maas/cengn_lynx/pod1/deployment.yaml ./deployment.yaml
         ;;
+    'custom' )
+        cp maas/custom/deployment.yaml ./deployment.yaml
+        ;;
     * )
         virtinstall=1
         ./cleanvm.sh
@@ -56,21 +59,23 @@ if [ ! -e $HOME/.ssh/id_rsa ]; then
     ssh-keygen -N '' -f $HOME/.ssh/id_rsa
 fi
 
-if [ ! -e /var/lib/libvirt/images ]; then
-
-    sudo apt-get install libvirt-bin -y
-    sudo adduser $USER libvirtd
-    sudo virsh pool-define-as default --type dir --target /var/lib/libvirt/images/
-    sudo virsh pool-start default
-    sudo virsh pool-autostart default
+#define the pool and try to start even though its already exist.
+# For fresh install this may or may not there.
 
-fi
+sudo apt-get install libvirt-bin -y
+sudo adduser $USER libvirtd
+sudo virsh pool-define-as default --type dir --target /var/lib/libvirt/images/ || true
+sudo virsh pool-start default || true
+sudo virsh pool-autostart default || true
 
 sudo apt-add-repository ppa:maas-deployers/stable -y
 sudo apt-add-repository ppa:juju/stable -y
 sudo apt-add-repository ppa:maas/stable -y
+sudo apt-add-repository cloud-archive:liberty -y
 sudo apt-get update -y
-sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip -y
+sudo apt-get -o Dpkg::Options::='--force-confold' --force-yes -fuy dist-upgrade
+sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip python-openstackclient
+
 sudo pip install shyaml
 juju init -f
 
@@ -123,7 +128,7 @@ crnodevlanint() {
 
     for nodes in $listofnodes
     do
-        parentid=`maas maas interface read $nodes eth2 | grep interfaces | cut -d '/' -f 8`
+        parentid=`maas maas interface read $nodes $2 | grep interfaces | cut -d '/' -f 8`
         maas maas interfaces create-vlan $nodes vlan=$1 parent=$parentid
      done
  }
@@ -177,8 +182,8 @@ case "$1" in
         maas refresh
         crvlanupdsubnet vlan721 1 "DataNetwork" 721 2 || true
         crvlanupdsubnet vlan724 2 "PublicNetwork" 724 3 || true
-        crnodevlanint $vlan721 || true
-        crnodevlanint $vlan724 || true
+        crnodevlanint $vlan721 eth2|| true
+        crnodevlanint $vlan724 eth2|| true
         enableautomodebyname eth2.721 AUTO "10.4.9.0/24" compute || true
         enableautomodebyname eth2.721 AUTO "10.4.9.0/24" control || true
         ;;
@@ -202,10 +207,10 @@ case "$1" in
         maas refresh
         crvlanupdsubnet vlan1201 1 "DataNetwork" 1201 2 || true
         crvlanupdsubnet vlan1202 2 "PublicNetwork" 1202 3 || true
-        crnodevlanint $vlan1201 || true
-        crnodevlanint $vlan1202 || true
-        enableautomode eth2.1201 AUTO "172.16.121.3/24" compute || true
-        enableautomode eth2.1201 AUTO "172.16.121.3/24" control || true
+        crnodevlanint $vlan1201 eth1 || true
+        crnodevlanint $vlan1202 eth1 || true
+        enableautomode eth1.1201 AUTO "172.16.121.3/24" compute || true
+        enableautomode eth1.1201 AUTO "172.16.121.3/24" control || true
         ;;
 esac