X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F03-maasdeploy.sh;h=f66d0cbd44e264121d53a8bf35613200077d9fe6;hb=c21e199a328c1d52232c213d2b243016cca46812;hp=8b7de401c23f77701b26f43d53700e75c11bdbf8;hpb=8211e9925de64f308b19e97a27eddb16389ebbbc;p=joid.git diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index 8b7de401..f66d0cbd 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-add-repository cloud-archive:ocata -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 @@ -91,7 +91,8 @@ SUBNET_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="admin")'. 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 ` -VLAN_TAG="untagged" +SUBNETFLOAT_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="floating")'.cidr | cut -d \" -f 2 ` +VLAN_UNTTAGED="untagged" # In the case of a virtual deployment get deployconfig.yaml if [ "$virtinstall" -eq 1 ]; then @@ -219,10 +220,10 @@ configuremaas(){ maas $PROFILE spaces create name=$space || true done - maas $PROFILE boot-source update $SOURCE_ID \ - url=$URL keyring_filename=$KEYRING_FILE || true + #maas $PROFILE boot-source update $SOURCE_ID \ + # url=$URL keyring_filename=$KEYRING_FILE || true maas $PROFILE boot-resources import || true - sleep 60 + sleep 10 while [ "$(maas $PROFILE boot-resources is-importing)" == "true" ]; do @@ -230,6 +231,74 @@ configuremaas(){ done } +deleteexistingnetw(){ + NETID_LIST=$(maas $PROFILE subnets read | jq ".[].id") + for NETID in $NETW; do + maas $PROFILE subnet delete $NETID_LIST + done +} + +setopnfvfabrics(){ + # Based on first node we get the fabric mapping + NODE_0_MAC_LIST=$(cat labconfig.json | jq --raw-output ".lab.racks[0].nodes[0].nics[] ".mac[] | sort -u) + FAB_ID=1 + for MAC in $NODE_0_MAC_LIST; do + # Create a new fabric + FABRIC_ID=$(maas $PROFILE fabrics create name=opnfv$FAB_ID| jq --raw-output ".id") + # Get the spaces attached to a mac + IF_SPACES=$(cat labconfig.json | jq --raw-output ".lab.racks[0].nodes[$NODE_ID].nics[] | select(.mac[] | contains(\"$MAC\")) ".spaces[]) + # Create the network attached to a space + for SPACE in $IF_SPACES; do + # First check if this space have a vlan + SP_VLAN=$(cat labconfig.json | jq --raw-output ".opnfv.spaces[] | select(.type==\"$SPACE\")".vlan) + # Create it if needed + if ([ $SP_VLAN ] && [ "$SP_VLAN" != "null" ]); then + maas $PROFILE vlans create $FABRIC_ID vid=$SP_VLAN + VID="vid=$SP_VLAN" + else + SP_VLAN=$VLAN_UNTTAGED + VID="" + fi + # Create the network + case "$SPACE" in + 'admin') SUBNET_CIDR=$SUBNET_CIDR; JUJU_SPACE="admin"; DHCP='enabled' ;; + 'data') SUBNET_CIDR=$SUBNETDATA_CIDR; JUJU_SPACE="tenant-data"; DHCP='' ;; + 'public') SUBNET_CIDR=$SUBNETPUB_CIDR; JUJU_SPACE="public-api"; DHCP='' ;; + 'storage') SUBNET_CIDR=$SUBNETSTOR_CIDR; JUJU_SPACE="tenant-api"; DHCP='' ;; + 'floating') SUBNET_CIDR=$SUBNETFLOAT_CIDR; JUJU_SPACE="tenant-public"; DHCP='' ;; + *) JUJU_SPACE='null'; DHCP='OFF'; echo " >>> Unknown SPACE" ;; + esac + # If we have a network, we create it + if ([ $SUBNET_CIDR ] && [ "$SUBNET_CIDR" != "null" ]); then + maas $PROFILE subnets create fabric=$FABRIC_ID cidr=$SUBNET_CIDR $VID + # Add the Gateway + GW=$(cat labconfig.json | jq ".opnfv.spaces[] | select(.type==\"$SPACE\")".gateway | cut -d \" -f 2) + if ([ $GW ] && [ "$GW" != "null" ]); then + maas $PROFILE subnet update $SUBNET_CIDR gateway_ip=$GW || true + fi + # Set ranges + SUBNET_PREFIX=${SUBNET_CIDR::-5} + IP_RES_RANGE_LOW="$SUBNET_PREFIX.1" + IP_RES_RANGE_HIGH="$SUBNET_PREFIX.39" + IP_DYNAMIC_RANGE_LOW="$SUBNET_PREFIX.40" + IP_DYNAMIC_RANGE_HIGH="$SUBNET_PREFIX.150" + maas $PROFILE ipranges create type=reserved \ + start_ip=$IP_RES_RANGE_LOW end_ip=$IP_RES_RANGE_HIGH \ + comment='This is a reserved range' || true + maas $PROFILE ipranges create type=dynamic \ + start_ip=$IP_DYNAMIC_RANGE_LOW end_ip=$IP_DYNAMIC_RANGE_HIGH \ + comment='This is a reserved dynamic range' || true + # Set DHCP + if [ $DHCP ]; then + PRIMARY_RACK_CONTROLLER=$(maas $PROFILE rack-controllers read | jq -r '.[0].system_id') + maas $PROFILE vlan update $FABRIC_ID $SP_VLAN dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true + fi + fi + done + FAB_ID=$((FAB_ID+1)) + done +} + enablesubnetanddhcp(){ TEMP_CIDR=$1 enabledhcp=$2 @@ -269,7 +338,7 @@ enablesubnetanddhcp(){ SPACEID=$(maas $PROFILE space read internal-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 + maas $PROFILE vlan update $FABRIC_ID $VLAN_UNTTAGED dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true fi elif [ "$space" == "data" ]; then MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.gateway | cut -d \" -f 2 ` @@ -280,7 +349,7 @@ enablesubnetanddhcp(){ 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 + maas $PROFILE vlan update $FABRIC_ID $VLAN_UNTTAGED 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 ` @@ -291,7 +360,7 @@ enablesubnetanddhcp(){ SPACEID=$(maas $PROFILE space read public-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 + maas $PROFILE vlan update $FABRIC_ID $VLAN_UNTTAGED 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 ` @@ -302,7 +371,7 @@ enablesubnetanddhcp(){ 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 + maas $PROFILE vlan update $FABRIC_ID $VLAN_UNTTAGED dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true fi fi } @@ -335,7 +404,7 @@ addnodes(){ fi sudo virt-install --connect qemu:///system --name bootstrap --ram 4098 --cpu host --vcpus 2 --video \ - cirrus --arch x86_64 --disk size=20,format=qcow2,bus=virtio,io=native,pool=default \ + cirrus --arch x86_64 --disk size=20,format=qcow2,bus=virtio,cache=directsync,io=native,pool=default \ $netw --boot network,hd,menu=off --noautoconsole \ --vnc --print-xml | tee bootstrap @@ -368,7 +437,7 @@ addnodes(){ 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 \ + --disk size=120,format=qcow2,bus=virtio,cache=directsync,io=native,pool=default \ $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` @@ -451,19 +520,6 @@ echo "... Deployment of maas finish ...." # Functions for MAAS network customization # -#Below function will mark the interfaces in Auto mode to enbled by MAAS -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 -} - #Below function will mark the interfaces in Auto mode to enbled by MAAS # using hostname of the node added into MAAS enableautomodebyname() { @@ -500,8 +556,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 } @@ -555,40 +613,93 @@ esac # # Enable MAAS nodes interfaces # +API_KEY=`sudo maas-region apikey --username=ubuntu` +maas login $PROFILE $API_SERVERMAAS $API_KEY + +if [ -e ./labconfig.json ]; then + # We will configure all node, so we need the qty, and loop on it + NODE_QTY=$(cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[]'.name | wc -l) + NODE_QTY=$((NODE_QTY-1)) + for NODE_ID in $(seq 0 $NODE_QTY); do + # Get the NAME/SYS_ID of this node + NODE_NAME=$(cat labconfig.json | jq --raw-output ".lab.racks[0].nodes[$NODE_ID].name") + NODE_SYS_ID=$(maas $PROFILE nodes read | jq -r ".[] | select(.hostname==\"$NODE_NAME\")".system_id) + echo ">>> Configuring node $NODE_NAME [$NODE_ID][$NODE_SYS_ID]" + # Recover the network interfaces list and configure each one + # with sorting the list, we have hardware interface first, than the vlan interfaces + IF_LIST=$(cat labconfig.json | jq --raw-output ".lab.racks[0].nodes[$NODE_ID].nics[] ".ifname ) + for IF_NAME in $IF_LIST; do + # get the space of the interface + IF_SPACE=$(cat labconfig.json | jq --raw-output ".lab.racks[0].nodes[$NODE_ID].nics[] | select(.ifname==\"$IF_NAME\") ".spaces[]) + case "$IF_SPACE" in + 'data') SUBNET_CIDR=$SUBNETDATA_CIDR; IF_MODE='AUTO' ;; + 'public') SUBNET_CIDR=$SUBNETPUB_CIDR; IF_MODE='AUTO' ;; + 'storage') SUBNET_CIDR=$SUBNETSTOR_CIDR; IF_MODE='AUTO' ;; + 'floating') SUBNET_CIDR=$SUBNETFLOAT_CIDR; IF_MODE='link_up' ;; + *) SUBNET_CIDR='null'; IF_MODE='null'; echo " >>> Unknown SPACE" ;; + esac + echo " >>> Configuring interface $IF_NAME [$IF_SPACE][$SUBNET_CIDR]" + + # if we have a vlan parameter in the space config + IF_VLAN=$(cat labconfig.json | jq --raw-output ".opnfv.spaces[] | select(.type==\"$IF_SPACE\")".vlan) + if ([ -z $IF_VLAN ] && [ $IF_NAME =~ \. ]); then + # We have no vlan specified on spaces, but we have a vlan subinterface + IF_VLAN = ${IF_NAME##*.}; fi + + # in case of interface renaming + IF_NEWNAME=$IF_NAME + + if ([ $IF_NEWNAME ] && [ "$IF_NEWNAME" != "null" ]); then + # rename interface if needed + IF_MACLOWER=$( cat labconfig.json | jq ".lab.racks[0].nodes[$NODE_ID].nics[] | select(.ifname==\"$IF_NEWNAME\")".mac[0]) + IF_MAC=(${IF_MACLOWER,,}) + IF_ID=$( maas ubuntu interfaces read $NODE_SYS_ID | jq ".[] | select(.mac_address==$IF_MAC)".id) + if ([ $IF_ID ] && [ "$IF_ID" != "null" ]); then + maas $PROFILE interface update $NODE_SYS_ID $IF_ID name=$IF_NEWNAME + IF_NAME=$IF_NEWNAME + fi + fi -#read interface needed in Auto mode and enable it. Will be rmeoved once auto enablement will be implemented in the maas-deployer. + # In case of a VLAN interface + if ([ $IF_VLAN ] && [ "$IF_VLAN" != "null" ]); then + echo " >>> Configuring VLAN $IF_VLAN" + VLANID=$(maas $PROFILE subnets read | jq ".[].vlan | select(.vid==$IF_VLAN)".id) + FABRICID=$(maas $PROFILE subnets read | jq ".[].vlan | select(.vid==$IF_VLAN)".fabric_id) + INTERFACE=$(maas $PROFILE interfaces read $NODE_SYS_ID | jq ".[] | select(.vlan.fabric_id==$FABRICID)".id) + if [[ -z $INTERFACE ]]; then + # parent interface is not set because it does not have a SUBNET_CIDR + PARENT_VLANID=$(maas $PROFILE fabrics read | jq ".[].vlans[] | select(.fabric_id==$FABRICID and .name==\"untagged\")".id) + # If we need to rename the interface, use new interface name + if ([ $IF_NEWNAME ] && [ "$IF_NEWNAME" != "null" ]); then + PARENT_IF_NAME=${IF_NEWNAME%%.*} + IF_NAME=$IF_NEWNAME + else + PARENT_IF_NAME=${IF_NAME%%.*} + fi + # We set the physical interface to the targeted fabric + maas $PROFILE interface update $NODE_SYS_ID $PARENT_IF_NAME vlan=$PARENT_VLANID + sleep 2 + INTERFACE=$(maas $PROFILE interfaces read $NODE_SYS_ID | jq ".[] | select(.vlan.fabric_id==$FABRICID)".id) + fi + maas $PROFILE interfaces create-vlan $NODE_SYS_ID vlan=$VLANID parent=$INTERFACE || true + fi + # Configure the interface + if ([ $SUBNET_CIDR ] && [ "$SUBNET_CIDR" != "null" ]); then + VLANID=$(maas $PROFILE subnet read $SUBNET_CIDR | jq -r '.vlan.id') + if !([ $IF_VLAN ] && [ "$IF_VLAN" != "null" ]); then + # If this interface is not a VLAN (done withe create-vlan) + maas $PROFILE interface update $NODE_SYS_ID $IF_NAME vlan=$VLANID + fi + maas $PROFILE interface link-subnet $NODE_SYS_ID $IF_NAME mode=$IF_MODE subnet=$SUBNET_CIDR || true + sleep 2 + else + echo " >>> Not configuring, we have an empty Subnet CIDR" + fi -if [ -e ./deployconfig.yaml ]; 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 - enableautomode ${EXTNET[i]} AUTO $SUBNETDATA_CIDR || true - 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 - enableautomode ${EXTNET[i]} AUTO $SUBNETPUB_CIDR || true - 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 - enableautomode ${EXTNET[i]} AUTO $SUBNETSTOR_CIDR || true - i=$[$i+1] - done - fi + done + done fi - # Add the cloud and controller credentials for MAAS for that lab. jujuver=`juju --version`