X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F03-maasdeploy.sh;h=39a7609bfa727342c93a15fcd65c66540a00c065;hb=cb6d37a8b4f7762fbd254e9870a19c2c4d865553;hp=eaccd341c4f4de56e611d919372a367e6c4661ec;hpb=f38006b0219673f86ebff002d0679cfeac230ebb;p=joid.git

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index eaccd341..39a7609b 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -10,12 +10,12 @@ if [ ! -e $HOME/.ssh/id_rsa ]; then
 fi
 
 #install the packages needed
-sudo apt-add-repository ppa:juju/devel -y
+sudo apt-add-repository ppa:juju/stable -y
 sudo apt-add-repository ppa:maas/stable -y
 sudo apt-add-repository cloud-archive:newton -y
 sudo apt-get update -y
 #sudo apt-get dist-upgrade -y
-sudo apt-get install openssh-server bzr git virtinst qemu-kvm libvirt-bin juju \
+sudo apt-get install bridge-utils 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 expect -y
@@ -90,6 +90,8 @@ PRIMARY_RACK_CONTROLLER="$MAAS_IP"
 SUBNET_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="admin")'.cidr | cut -d \" -f 2 `
 SUBNETDATA_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.cidr | cut -d \" -f 2 `
 SUBNETPUB_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="public")'.cidr | cut -d \" -f 2 `
+SUBNETSTOR_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="storage")'.cidr | cut -d \" -f 2 `
+SUBNETFLOAT_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="floating")'.cidr | cut -d \" -f 2 `
 VLAN_TAG="untagged"
 
 # In the case of a virtual deployment get deployconfig.yaml
@@ -192,6 +194,7 @@ configuremaas(){
     #reconfigure maas with correct MAAS address.
     #Below code is needed as MAAS have issue in commisoning without restart.
     sudo ./maas-reconfigure-region.sh $MAAS_IP
+    sleep 30
     sudo maas-rack config --region-url http://$MAAS_IP:5240/MAAS
 
     sudo maas createadmin --username=ubuntu --email=ubuntu@ubuntu.com --password=ubuntu || true
@@ -203,27 +206,24 @@ configuremaas(){
     maas $PROFILE maas set-config name='ntp_server' value='ntp.ubuntu.com' || true
     maas $PROFILE sshkeys create "key=$SSH_KEY" || true
 
-    maas $PROFILE tags create name='bootstrap' || true
-    maas $PROFILE tags create name='compute' || true
-    maas $PROFILE tags create name='control' || true
-    maas $PROFILE tags create name='storage' || true
+    for tag in bootstrap compute control storage
+    do
+        maas $PROFILE tags create name=$tag || true
+    done
 
     #create the required spaces.
     maas $PROFILE space update 0 name=default || true
-    maas $PROFILE spaces create name=unused || true
-    maas $PROFILE spaces create name=admin-api || true
-    maas $PROFILE spaces create name=internal-api || true
-    maas $PROFILE spaces create name=public-api || true
-    maas $PROFILE spaces create name=compute-data || true
-    maas $PROFILE spaces create name=compute-external || true
-    maas $PROFILE spaces create name=storage-data || true
-    maas $PROFILE spaces create name=storage-cluster || true
-
-    maas $PROFILE boot-source update $SOURCE_ID \
-         url=$URL keyring_filename=$KEYRING_FILE || true
+    for space in unused admin-api internal-api public-api compute-data \
+                 compute-external storage-data storage-cluster
+    do
+        echo "Creating the space $space"
+        maas $PROFILE spaces create name=$space || true
+    done
 
-    maas $PROFILE boot-resources import || true
-    sleep 10
+    #maas $PROFILE boot-source update $SOURCE_ID \
+    #     url=$URL keyring_filename=$KEYRING_FILE || true
+    #maas $PROFILE boot-resources import || true
+    #sleep 60
 
     while [ "$(maas $PROFILE boot-resources is-importing)" == "true" ];
     do
@@ -262,7 +262,9 @@ enablesubnetanddhcp(){
     if [ "$space" == "admin" ]; then
         MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="admin")'.gateway | cut -d \" -f 2 `
         #MY_NAMESERVER=`cat deployconfig.json | jq '.opnfv.upstream_dns' | cut -d \" -f 2`
-        maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
+        if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
+            maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
+        fi
         #maas $PROFILE subnet update $TEMP_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')
@@ -272,18 +274,18 @@ enablesubnetanddhcp(){
         fi
     elif [ "$space" == "data" ]; then
         MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.gateway | cut -d \" -f 2 `
-        if [ $MY_GATEWAY ]; then
+        if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
             maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
         fi
         #below command will enable the interface with data-api space for data network.
-        SPACEID=$(maas $PROFILE space read data-api | jq '.id')
+        SPACEID=$(maas $PROFILE space read admin-api | jq '.id')
         maas $PROFILE subnet update $TEMP_CIDR space=$SPACEID || true
         if [ "$enabledhcp" == "true" ]; then
             maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
         fi
     elif [ "$space" == "public" ]; then
         MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.public | cut -d \" -f 2 `
-        if [ $MY_GATEWAY ]; then
+        if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
             maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
         fi
         #below command will enable the interface with public-api space for data network.
@@ -292,6 +294,17 @@ enablesubnetanddhcp(){
         if [ "$enabledhcp" == "true" ]; then
             maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
         fi
+    elif [ "$space" == "storage" ]; then
+        MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.storage | cut -d \" -f 2 `
+        if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
+            maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
+        fi
+        #below command will enable the interface with public-api space for data network.
+        SPACEID=$(maas $PROFILE space read storage-data | jq '.id')
+        maas $PROFILE subnet update $TEMP_CIDR space=$SPACEID || true
+        if [ "$enabledhcp" == "true" ]; then
+            maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
+        fi
     fi
 }
 
@@ -344,54 +357,32 @@ addnodes(){
         power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
         architecture='amd64/generic' power_parameters_power_id='bootstrap'
 
-    bootstrapid=$(maas $PROFILE machines read | jq -r 'select(.[].hostname == "bootstrap")[0].system_id')
+    bootstrapid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "bootstrap").system_id')
 
     maas $PROFILE tag update-nodes bootstrap add=$bootstrapid
 
     if [ "$virtinstall" -eq 1 ]; then
+        units=`cat deployconfig.json | jq .opnfv.units`
 
-        sudo virt-install --connect qemu:///system --name node1-control --ram 8192 --cpu host --vcpus 4 \
+        until [ $(($units)) -lt 1 ]; do
+           units=$(($units - 1));
+           NODE_NAME=`cat labconfig.json | jq ".lab.racks[].nodes[$units].name" | cut -d \" -f 2 `
+
+            sudo virt-install --connect qemu:///system --name $NODE_NAME --ram 8192 --cpu host --vcpus 4 \
                      --disk size=120,format=qcow2,bus=virtio,io=native,pool=default \
-                     $netw $netw --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node1-control
-
-        sudo virt-install --connect qemu:///system --name node2-compute --ram 8192 --cpu host --vcpus 4 \
-                    --disk size=120,format=qcow2,bus=virtio,io=native,pool=default \
-                    $netw $netw --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node2-compute
-
-        sudo virt-install --connect qemu:///system --name node5-compute --ram 8192 --cpu host --vcpus 4 \
-                   --disk size=120,format=qcow2,bus=virtio,io=native,pool=default \
-                   $netw $netw --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node5-compute
-
-
-        node1controlmac=`grep  "mac address" node1-control | head -1 | cut -d '"' -f 2`
-        node2computemac=`grep  "mac address" node2-compute | head -1 | cut -d '"' -f 2`
-        node5computemac=`grep  "mac address" node5-compute | head -1 | cut -d '"' -f 2`
-
-        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' \
-            tags='control' hostname='node1-control' power_type='virsh' mac_addresses=$node1controlmac \
-            power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
-            architecture='amd64/generic' power_parameters_power_id='node1-control'
-        controlnodeid=$(maas $PROFILE machines read | jq -r 'select(.[].hostname == "node1-control")[0].system_id')
-        maas $PROFILE machines create autodetect_nodegroup='yes' name='node2-compute' \
-            tags='compute' hostname='node2-compute' power_type='virsh' mac_addresses=$node2computemac \
-            power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
-            architecture='amd64/generic' power_parameters_power_id='node2-compute'
-        compute2nodeid=$(maas $PROFILE machines read | jq -r 'select(.[].hostname == "node2-compute")[0].system_id')
-        maas $PROFILE machines create autodetect_nodegroup='yes' name='node5-compute' \
-            tags='compute' hostname='node5-compute' power_type='virsh' mac_addresses=$node5computemac \
-            power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
-            architecture='amd64/generic' power_parameters_power_id='node5-compute'
-        compute5nodeid=$(maas $PROFILE machines read | jq -r 'select(.[].hostname == "node5-compute")[0].system_id')
-
-        maas $PROFILE tag update-nodes control add=$controlnodeid || true
-        maas $PROFILE tag update-nodes compute add=$compute2nodeid || true
-        maas $PROFILE tag update-nodes compute add=$compute5nodeid || true
+                     $netw $netw --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee $NODE_NAME
+
+            nodemac=`grep  "mac address" $NODE_NAME | head -1 | cut -d '"' -f 2`
+            sudo virsh -c qemu:///system define --file $NODE_NAME
+            rm -f $NODE_NAME
+            maas $PROFILE machines create autodetect_nodegroup='yes' name=$NODE_NAME \
+                tags='control compute' hostname=$NODE_NAME power_type='virsh' mac_addresses=$nodemac \
+                power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
+                architecture='amd64/generic' power_parameters_power_id=$NODE_NAME
+            nodeid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == '\"$NODE_NAME\"').system_id')
+            maas $PROFILE tag update-nodes control add=$nodeid || true
+            maas $PROFILE tag update-nodes compute add=$nodeid || true
+        done
     else
        units=`cat deployconfig.json | jq .opnfv.units`
 
@@ -440,6 +431,10 @@ if [ $SUBNETPUB_CIDR ]; then
     enablesubnetanddhcp $SUBNETPUB_CIDR false public
 fi
 
+if [ $SUBNETSTOR_CIDR ]; then
+    enablesubnetanddhcp $SUBNETSTOR_CIDR false storage
+fi
+
 #just make sure rack controller has been synced and import only
 # just whether images have been imported or not.
 sleep 120
@@ -461,9 +456,11 @@ echo "... Deployment of maas finish ...."
 enableautomode() {
     API_KEY=`sudo maas-region apikey --username=ubuntu`
     maas login $PROFILE $API_SERVERMAAS $API_KEY
+    vlanid=$(maas $PROFILE subnet read $3 | jq -r '.vlan.id')
 
     for node in $(maas $PROFILE nodes read | jq -r '.[].system_id')
     do
+        maas $PROFILE interface update $node $1 vlan=$vlanid
         maas $PROFILE interface link-subnet $node $1  mode=$2 subnet=$3 || true
     done
 }
@@ -504,8 +501,10 @@ crnodevlanint() {
 
     for node in $(maas $PROFILE nodes read | jq -r '.[].system_id')
     do
-        interface=$(maas $PROFILE interface read $node $2 | jq -r '.id')
-        maas $PROFILE interfaces create-vlan $node vlan=$1 parent=$interface
+        vlanid=$(maas $PROFILE subnets read | jq '.[].vlan | select(.vid=='$1')'.id)
+        fabricid=`maas $PROFILE subnets read | jq '.[].vlan | select(.vid=='$1')'.fabric_id`
+        interface=`maas $PROFILE interfaces read $node | jq '.[] | select(.vlan.fabric_id=='$fabricid')'.id`
+        maas $PROFILE interfaces create-vlan $node vlan=$vlanid parent=$interface || true
      done
  }
 
@@ -538,7 +537,6 @@ addcloud() {
     juju add-cloud $cloudname maas-cloud.yaml --replace
 }
 
-
 #
 # VLAN customization
 #
@@ -562,40 +560,106 @@ esac
 #
 
 #read interface needed in Auto mode and enable it. Will be rmeoved once auto enablement will be implemented in the maas-deployer.
+# Enable only non vlan interfaces first.
+if [ -e ./labconfig.json ]; then
+  if [ $SUBNETDATA_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="data")'.ifname | sort -u`
+      i="0"
+      while [ ! -z "${EXTNET[i]}" ];
+      do
+          if ([ -z $VLAN ] || [ "$VLAN" == "null" ]); then
+              enableautomode ${EXTNET[i]} AUTO $SUBNETDATA_CIDR || true
+          fi
+          i=$[$i+1]
+      done
+  fi
+  if [ $SUBNETPUB_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="public")'.ifname | sort -u`
+      i="0"
+      while [ ! -z "${EXTNET[i]}" ];
+      do
+          if ([ -z $VLAN ] || [ "$VLAN" == "null" ]); then
+              enableautomode ${EXTNET[i]} AUTO $SUBNETPUB_CIDR || true
+          fi
+          i=$[$i+1]
+      done
+  fi
+  if [ $SUBNETSTOR_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="storage")'.ifname | sort -u`
+      i="0"
+      while [ ! -z "${EXTNET[i]}" ];
+      do
+          if ([ -z $VLAN ] || [ "$VLAN" == "null" ]); then
+              enableautomode ${EXTNET[i]} AUTO $SUBNETSTOR_CIDR || true
+          fi
+          i=$[$i+1]
+      done
+  fi
+  if [ $SUBNETFLOAT_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="floating")'.ifname | sort -u`
+      i="0"
+      while [ ! -z "${EXTNET[i]}" ];
+      do
+          if ([ -z $VLAN ] || [ "$VLAN" == "null" ]); then
+              enableautomode ${EXTNET[i]} link_up $SUBNETFLOAT_CIDR || true
+          fi
+          i=$[$i+1]
+      done
+  fi
+fi
 
-if [ -e ./deployconfig.yaml ]; then
-  enableiflist=`grep "interface-enable" deployconfig.yaml | cut -d ' ' -f 4 `
-  datanet=`grep "dataNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
-  stornet=`grep "storageNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
-  pubnet=`grep "publicNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
-
-  # split EXTERNAL_NETWORK=first ip;last ip; gateway;network
+#enable only the vlan interfaces which were ignore in previous run.
 
-  if [ "$datanet" != "''" ]; then
-      EXTNET=(${enableiflist//,/ })
+if [ -e ./labconfig.json ]; then
+  if [ $SUBNETDATA_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="data")'.ifname | sort -u`
+      VLAN=`cat labconfig.json | jq --raw-output '.opnfv.spaces[] | select(.type=="data")'.vlan`
       i="0"
       while [ ! -z "${EXTNET[i]}" ];
       do
-          enableautomode ${EXTNET[i]} AUTO $datanet || true
+          if ([ $VLAN ] && [ "$VLAN" != "null" ]); then
+              crnodevlanint $VLAN || true
+              enableautomode ${EXTNET[i]} AUTO $SUBNETDATA_CIDR || true
+          fi
+          i=$[$i+1]
+      done
+  fi
+  if [ $SUBNETPUB_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="public")'.ifname | sort -u`
+      VLAN=`cat labconfig.json | jq --raw-output '.opnfv.spaces[] | select(.type=="public")'.vlan`
+      i="0"
+      while [ ! -z "${EXTNET[i]}" ];
+      do
+          if ([ $VLAN ] && [ "$VLAN" != "null" ]); then
+              crnodevlanint $VLAN || true
+              enableautomode ${EXTNET[i]} AUTO $SUBNETPUB_CIDR || true
+          fi
           i=$[$i+1]
       done
-
   fi
-  if [ "$stornet" != "''" ]; then
-      EXTNET=(${enableiflist//,/ })
+  if [ $SUBNETSTOR_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="storage")'.ifname | sort -u`
+      VLAN=`cat labconfig.json | jq --raw-output '.opnfv.spaces[] | select(.type=="storage")'.vlan`
       i="0"
       while [ ! -z "${EXTNET[i]}" ];
       do
-          enableautomode ${EXTNET[i]} AUTO $stornet || true
+          if ([ $VLAN ] && [ "$VLAN" != "null" ]); then
+              crnodevlanint $VLAN || true
+              enableautomode ${EXTNET[i]} AUTO $SUBNETSTOR_CIDR || true
+          fi
           i=$[$i+1]
       done
   fi
-  if [ "$pubnet" != "''" ]; then
-      EXTNET=(${enableiflist//,/ })
+  if [ $SUBNETFLOAT_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="floating")'.ifname | sort -u`
+      VLAN=`cat labconfig.json | jq --raw-output '.opnfv.spaces[] | select(.type=="floating")'.vlan`
       i="0"
       while [ ! -z "${EXTNET[i]}" ];
       do
-          enableautomode ${EXTNET[i]} AUTO $pubnet || true
+          if ([ $VLAN ] && [ "$VLAN" != "null" ]); then
+              crnodevlanint $VLAN || true
+              enableautomode ${EXTNET[i]} link_up $SUBNETFLOAT_CIDR || true
+          fi
           i=$[$i+1]
       done
   fi