modified to enable the interface with internal-api space for

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

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index df47af6..e74de25 100755 (executable)
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -10,7 +10,7 @@ if [ ! -e $HOME/.ssh/id_rsa ]; then
 fi
 
 #install the packages needed
-sudo apt-add-repository ppa:juju/dev -y
+sudo apt-add-repository ppa:juju/devel -y
 sudo apt-add-repository ppa:maas/stable -y
 sudo apt-add-repository cloud-archive:newton -y
 sudo apt-get update -y
@@ -18,7 +18,7 @@ sudo apt-get update -y
 sudo apt-get install openssh-server bzr git virtinst qemu-kvm libvirt-bin juju \
              maas maas-region-controller python-pip python-psutil python-openstackclient \
              python-congressclient gsutil charm-tools pastebinit python-jinja2 sshpass \
-             openssh-server vlan ipmitool jq -y
+             openssh-server vlan ipmitool jq expect -y
 
 sudo pip install --upgrade pip
 
@@ -112,16 +112,14 @@ fi
 #
 
 # make sure no password asked during the deployment.
-echo "$USER ALL=(ALL) NOPASSWD:ALL" > 90-joid-init
-
-if [ -e /etc/sudoers.d/90-joid-init ]; then
-    sudo cp /etc/sudoers.d/90-joid-init 91-joid-init
-    sudo chown $USER:$USER 91-joid-init
-    sudo chmod 660 91-joid-init
-    sudo cat 90-joid-init >> 91-joid-init
-    sudo chown root:root 91-joid-init
-    sudo mv 91-joid-init /etc/sudoers.d/
+sudoer_file=/etc/sudoers.d/90-joid-init
+sudoer_entry="$USER ALL=(ALL) NOPASSWD:ALL"
+if [ -e $sudoer_file ]; then
+    if ! sudo grep -q "$sudoer_entry" $sudoer_file; then
+        sudo sed -i -e "1i$sudoer_entry" $sudoer_file
+    fi
 else
+    echo "$sudoer_entry" > 90-joid-init
     sudo chown root:root 90-joid-init
     sudo mv 90-joid-init /etc/sudoers.d/
 fi
@@ -147,6 +145,7 @@ if [ "$virtinstall" -eq 1 ]; then
     sudo virsh net-define default-net-org.xml
     sudo virsh net-destroy default
     sudo virsh net-start default
+    rm -f default-net-org.xml
 fi
 
 #
@@ -270,30 +269,11 @@ enablesubnetanddhcp(){
     maas $PROFILE subnet update $SUBNET_CIDR gateway_ip=$MY_GATEWAY || true
     maas $PROFILE subnet update $SUBNET_CIDR dns_servers=$MY_NAMESERVER || true
 
-}
+    #below command will enable the interface with internal-api space.
+
+    SPACEID=$(maas $PROFILE space read internal-api | jq '.id')
+    maas $PROFILE subnet update $SUBNET_CIDR space=$SPACEID || true
 
-## derived from https://gist.github.com/epiloque/8cf512c6d64641bde388
-## works for arrays of hashes, as long as the hashes do not have arrays
-parse_yaml2() {
-    local prefix=$2
-    local s
-    local w
-    local fs
-    s='[[:space:]]*'
-    w='[a-zA-Z0-9_]*'
-    fs="$(echo @|tr @ '\034')"
-    sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \
-        -e "s|^\($s\)\($w\)$s[:-]$s\(.*\)$s\$|\1$fs\2$fs\3|p" "$1" |
-    awk -F"$fs" '{
-      indent = length($1)/2;
-      if (length($2) == 0) { conj[indent]="+";} else {conj[indent]="";}
-      vname[indent] = $2;
-      for (i in vname) {if (i > indent) {delete vname[i]}}
-      if (length($3) > 0) {
-              vn=""; for (i=0; i<indent; i++) {vn=(vn)(vname[i])("_")}
-              printf("%s%s%s%s=(\"%s\")\n", "'"$prefix"'",vn, $2, conj[indent-1],$3);
-      }
-    }' | sed 's/_=/+=/g'
 }
 
 addnodes(){
@@ -307,7 +287,7 @@ addnodes(){
     done
 
     if [ "$virtinstall" -eq 1 ]; then
-        ntew=" --network bridge=virbr0,model=virtio"
+        netw=" --network bridge=virbr0,model=virtio"
     else
         brid=`brctl show | grep 8000 | cut -d "8" -f 1 |  tr "\n" " " | tr "\t" " " | tr -s " "`
 
@@ -338,6 +318,7 @@ addnodes(){
         done
     fi
     sudo virsh -c qemu:///system define --file bootstrap
+    rm -f bootstrap
 
     maas $PROFILE machines create autodetect_nodegroup='yes' name='bootstrap' \
         tags='bootstrap' hostname='bootstrap' power_type='virsh' mac_addresses=$bootstrapmac \
@@ -370,6 +351,7 @@ addnodes(){
         sudo virsh -c qemu:///system define --file node1-control
         sudo virsh -c qemu:///system define --file node2-compute
         sudo virsh -c qemu:///system define --file node5-compute
+        rm -f node1-control node2-compute node5-compute
 
 
         maas $PROFILE machines create autodetect_nodegroup='yes' name='node1-control' \
@@ -394,17 +376,29 @@ addnodes(){
     fi
 }
 
+#configure MAAS with the different options.
 configuremaas
+
 if [ "$virtinstall" -eq 1 ]; then
     enablesubnetanddhcp
 fi
 
+sleep 60
+
+#reconfigure maas with correct MAAS address.
+#Below code is needed as MAAS have issue in commisoning without restart.
+sudo ./maas-reconfigure-rack.sh $MAAS_IP
+sudo ./maas-reconfigure-region.sh $MAAS_IP
+
 # lets sleep for around 5 more minutes to make sure all images are in sync.
-sleep(300)
+sleep 240
 
 #lets add the nodes now. Currently works only for virtual deploymnet.
 addnodes
 
+#take another 5 minutes to commision the nodes.
+sleep 300
+
 echo "... Deployment of maas finish ...."
 
 #Added the Qtip public to run the Qtip test after install on bare metal nodes.
@@ -563,7 +557,7 @@ fi
 # Add the cloud and controller credentials for MAAS for that lab.
 jujuver=`juju --version`
 
-if [ "$jujuver" > "2" ]; then
+if [[ "$jujuver" > "2" ]]; then
     addcloud
     addcredential
 fi