fi
#install the packages needed
+sudo apt-get install software-properties-common -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 bridge-utils openssh-server bzr git virtinst qemu-kvm libvirt-bin juju \
MY_UPSTREAM_DNS=`grep "upstream_dns" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
SSH_KEY=`cat ~/.ssh/id_rsa.pub`
MAIN_ARCHIVE=`grep "main_archive" deployconfig.yaml | cut -d ':' -f 2-3 | sed -e 's/ //'`
-URL=https://images.maas.io/ephemeral-v2/daily/
+URL=https://images.maas.io/ephemeral-v3/daily/
KEYRING_FILE=/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
SOURCE_ID=1
FABRIC_ID=1
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_UNTTAGED="untagged"
# In the case of a virtual deployment get deployconfig.yaml
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
+ #sudo ./maas-reconfigure-region.sh $MAAS_IP
sleep 30
sudo maas-rack config --region-url http://$MAAS_IP:5240/MAAS
#create the required spaces.
maas $PROFILE space update 0 name=default || true
for space in unused admin-api internal-api public-api compute-data \
- compute-external storage-data storage-cluster
+ compute-external storage-data storage-cluster admin \
+ tenant-data tenant-api tenant-public
do
echo "Creating the space $space"
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-resources import || true
- #sleep 60
+ maas $PROFILE boot-source update $SOURCE_ID \
+ url=$URL keyring_filename=$KEYRING_FILE || true
+
+ maas $PROFILE boot-resources import || true
while [ "$(maas $PROFILE boot-resources is-importing)" == "true" ];
do
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"
+setupspacenetwork(){
+
+ #get space, subnet and vlan and create accordingly.
+ #for type in admin data storage external floating public; do
+ nettypes=`cat labconfig.json | jq '.opnfv.spaces[]'.type | cut -d \" -f 2`
+ for type in $nettypes; do
+ config_done=0
+ SPACE_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="'$type'")'.cidr | cut -d \" -f 2 `
+ SPACE_VLAN=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="'$type'")'.vlan | cut -d \" -f 2 `
+ SPACE_GWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="'$type'")'.gateway | cut -d \" -f 2 `
+ NET_FABRIC_NAME=$(maas $PROFILE subnets read | jq -r ".[] | select(.cidr==\"$SPACE_CIDR\")".vlan.fabric)
+ if ([ $NET_FABRIC_NAME ] && [ $NET_FABRIC_NAME != "null" ]); then
+ NET_FABRIC_VID=$(maas $PROFILE subnets read | jq -r ".[] | select(.cidr==\"$SPACE_CIDR\")".vlan.vid)
+ NET_FABRIC_ID=$(maas $PROFILE fabric read $NET_FABRIC_NAME | jq -r ".id")
+ if ([ $SPACE_VLAN == "null" ]); then
+ SPACE_VLAN=0
+ fi
+ NET_VLAN_ID=$(maas $PROFILE vlans read $NET_FABRIC_ID | jq -r ".[] | select(.vid==\"$SPACE_VLAN\")".id)
+ NET_VLAN_VID=$(maas $PROFILE vlans read $NET_FABRIC_ID | jq -r ".[] | select(.vid==\"$SPACE_VLAN\")".vid)
+ if ([ $SPACE_GWAY ] && [ "$SPACE_GWAY" != "null" ]); then
+ maas $PROFILE subnet update $SPACE_CIDR gateway_ip=$SPACE_GWAY
+ fi
+ if ([ $NET_VLAN_VID ] && [ $NET_VLAN_VID == "0" ]); then
+ config_done=1
+ elif ([ $NET_VLAN_VID ] && [ $NET_VLAN_VID == $SPACE_VLAN ]); then
+ config_done=1
else
- SP_VLAN=$VLAN_UNTTAGED
- VID=""
+ NET_VLAN_ID=$(maas $PROFILE vlans create $NET_FABRIC_ID vid=$SPACE_VLAN | jq --raw-output ".id")
+ if ([ $NET_VLAN_ID ] && [ $NET_VLAN_ID != "null" ]); then
+ maas $PROFILE subnet update $SPACE_CIDR vlan=$NET_VLAN_ID
+ NET_FABRIC_VID=$SPACE_VLAN
+ fi
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
+ else
+ if ([ $SPACE_CIDR ] && [ "$SPACE_CIDR" != "null" ]); then
+ FABRIC_ID=$(maas $PROFILE fabrics create name=opnfv$type | jq --raw-output ".id")
+ NET_FABRIC_ID=$FABRIC_ID
+ NET_FABRIC_VID=$SPACE_VLAN
+ if ([ $SPACE_VLAN ] && [ "$SPACE_VLAN" != "null" ]); then
+ NET_VLAN_ID=$(maas $PROFILE vlans create $FABRIC_ID vid=$SPACE_VLAN | jq --raw-output ".id")
+ if ([ $SPACE_GWAY ] && [ "$SPACE_GWAY" != "null" ]); then
+ maas $PROFILE subnets create fabric=$FABRIC_ID cidr=$SPACE_CIDR vid=$VID_ID gateway_ip=$SPACE_GWAY
+ else
+ maas $PROFILE subnets create fabric=$FABRIC_ID cidr=$SPACE_CIDR vid=$VID_ID
+ fi
+ NET_FABRIC_VID=$VLAN_ID
+ else
+ if ([ $SPACE_GWAY ] && [ "$SPACE_GWAY" != "null" ]); then
+ maas $PROFILE subnets create fabric=$FABRIC_ID cidr=$SPACE_CIDR vid="0" gateway_ip=$SPACE_GWAY
+ else
+ maas $PROFILE subnets create fabric=$FABRIC_ID cidr=$SPACE_CIDR vid="0"
+ fi
fi
+ NET_FABRIC_NAME=$(maas $PROFILE subnets read | jq -r ".[] | select(.cidr==\"$SPACE_CIDR\")".vlan.fabric)
+ fi
+ fi
+ case "$type" in
+ 'admin') JUJU_SPACE="internal-api"; DHCP='enabled' ;;
+ 'data') JUJU_SPACE="tenant-data"; DHCP='' ;;
+ 'public') JUJU_SPACE="public-api"; DHCP='' ;;
+ 'storage') JUJU_SPACE="tenant-stor"; DHCP='' ;;
+ 'storagecluster') JUJU_SPACE="storclus"; DHCP='' ;;
+ 'floating') JUJU_SPACE="tenant-public"; DHCP='' ;;
+ *) JUJU_SPACE='default'; DHCP='OFF'; echo " >>> Unknown SPACE" ;;
+ esac
+ JUJU_SPACE_ID=$(maas $PROFILE spaces read | jq -r ".[] | select(.name==\"$JUJU_SPACE\")".id)
+ if ([ $NET_FABRIC_NAME ] && [ $NET_FABRIC_NAME != "null" ]); then
+ maas $PROFILE subnet update $SPACE_CIDR space=$JUJU_SPACE_ID
+ fi
+ if ([ $type == "admin" ]); then
+ # If we have a network, we create it
+ if ([ $NET_FABRIC_ID ]); then
# Set ranges
- SUBNET_PREFIX=${SUBNET_CIDR::-5}
+ SUBNET_PREFIX=${SPACE_CIDR::-5}
IP_RES_RANGE_LOW="$SUBNET_PREFIX.1"
IP_RES_RANGE_HIGH="$SUBNET_PREFIX.39"
IP_DYNAMIC_RANGE_LOW="$SUBNET_PREFIX.40"
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
+ PRIMARY_RACK_CONTROLLER=$(maas $PROFILE rack-controllers read | jq -r '.[0].system_id')
+ maas $PROFILE vlan update $NET_FABRIC_ID $NET_FABRIC_VID dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
fi
- done
- FAB_ID=$((FAB_ID+1))
- done
-}
-
-enablesubnetanddhcp(){
- TEMP_CIDR=$1
- enabledhcp=$2
- space=$3
-
- SUBNET_PREFIX=${TEMP_CIDR::-5}
-
- IP_RES_RANGE_LOW="$SUBNET_PREFIX.1"
- IP_RES_RANGE_HIGH="$SUBNET_PREFIX.39"
-
- API_KEY=`sudo maas-region apikey --username=ubuntu`
- maas login $PROFILE $API_SERVERMAAS $API_KEY
-
- 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
-
- IP_DYNAMIC_RANGE_LOW="$SUBNET_PREFIX.40"
- IP_DYNAMIC_RANGE_HIGH="$SUBNET_PREFIX.150"
-
- 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
-
- FABRIC_ID=$(maas $PROFILE subnet read $TEMP_CIDR | jq '.vlan.fabric_id')
-
- PRIMARY_RACK_CONTROLLER=$(maas $PROFILE rack-controllers read | jq -r '.[0].system_id')
-
- 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`
- 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')
- maas $PROFILE subnet update $TEMP_CIDR space=$SPACEID || true
- if [ "$enabledhcp" == "true" ]; then
- 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 `
- 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 admin-api | jq '.id')
- maas $PROFILE subnet update $TEMP_CIDR space=$SPACEID || true
- if [ "$enabledhcp" == "true" ]; then
- 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 `
- 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 public-api | jq '.id')
- maas $PROFILE subnet update $TEMP_CIDR space=$SPACEID || true
- if [ "$enabledhcp" == "true" ]; then
- 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 `
- 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_UNTTAGED dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
- fi
- fi
+ done
}
addnodes(){
# make sure there is no machine entry in maas
for m in $(maas $PROFILE machines read | jq -r '.[].system_id')
do
- maas ubuntu machine delete $m
+ maas $PROFILE machine delete $m
done
+ # if we have a virshurl configuration we use it, else we use local
+ VIRSHURL=$(cat labconfig.json | jq -r '.opnfv.virshurl')
+ if ([ $VIRSHURL == "" ] || [ "$VIRSHURL" == "null" ]); then
+ VIRSHURL="qemu+ssh://$USER@$MAAS_IP/system "
+ VIRSHHOST=""
+ else
+ VIRSHHOST=$(echo $VIRSHURL| cut -d\/ -f 3 | cut -d@ -f2)
+ fi
+
if [ "$virtinstall" -eq 1 ]; then
netw=" --network bridge=virbr0,model=virtio"
+ elif ([ $VIRSHHOST != "" ]); then
+ # Get the bridge hosting the remote virsh
+ brid=$(ssh $VIRSHHOST "ip a l | grep $VIRSHHOST | perl -pe 's/.* (.*)\$/\$1/g'")
+ netw=" --network bridge=$brid,model=virtio"
+ # prepare a file containing virsh remote url to connect without adding it n command line
+ echo "export VIRSH_DEFAULT_CONNECT_URI=$VIRSHURL" > virsh_uri.sh
else
- brid=`brctl show | grep 8000 | cut -d "8" -f 1 | tr "\n" " " | tr "\t" " " | tr -s " "`
+ brid=`brctl show | grep 8000 | cut -d "8" -f 1 | tr "\n" " " | tr " " " " | tr -s " "`
netw=""
for feature in $brid; do
done
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 \
+ virt-install --connect $VIRSHURL --name bootstrap --ram 4098 --cpu host --vcpus 2 --video \
+ 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
bootstrapmac=$bootstrapmac" mac_addresses="$mac
done
fi
- sudo virsh -c qemu:///system define --file bootstrap
+ virsh -c $VIRSHURL define --file bootstrap
rm -f bootstrap
+ sleep 60
+
maas $PROFILE machines create autodetect_nodegroup='yes' name='bootstrap' \
tags='bootstrap' hostname='bootstrap' power_type='virsh' mac_addresses=$bootstrapmac \
- power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
+ power_parameters_power_address="$VIRSHURL" \
architecture='amd64/generic' power_parameters_power_id='bootstrap'
bootstrapid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "bootstrap").system_id')
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 \
+ sudo virt-install --connect $VIRSHURL --name $NODE_NAME --ram 8192 --cpu host --vcpus 4 \
+ --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`
- sudo virsh -c qemu:///system define --file $NODE_NAME
+ sudo virsh -c $VIRSHURL --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' \
+ power_parameters_power_address="$VIRSHURL" \
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
}
-#configure MAAS with the different options.
+# configure MAAS with the different options.
configuremaas
+sleep 30
# functioncall with subnetid to add and second parameter is dhcp enable
# third parameter will define the space. It is required to have admin
-if [ $SUBNET_CIDR ]; then
- enablesubnetanddhcp $SUBNET_CIDR true admin
-else
- echo "atleast admin network should be defined"
- echo "MAAS configuration can not continue"
- exit 2
-fi
-
-if [ $SUBNETDATA_CIDR ]; then
- enablesubnetanddhcp $SUBNETDATA_CIDR false data
-fi
-if [ $SUBNETPUB_CIDR ]; then
- enablesubnetanddhcp $SUBNETPUB_CIDR false public
-fi
-
-if [ $SUBNETSTOR_CIDR ]; then
- enablesubnetanddhcp $SUBNETSTOR_CIDR false storage
-fi
+setupspacenetwork
#just make sure rack controller has been synced and import only
# just whether images have been imported or not.
+sudo ./maas-reconfigure-region.sh $MAAS_IP
sleep 120
#lets add the nodes now. Currently works only for virtual deploymnet.
#maas $PROFILE sshkeys new key="`cat ./maas/sshkeys/QtipKey.pub`"
#maas $PROFILE sshkeys new key="`cat ./maas/sshkeys/DominoKey.pub`"
-#
-# Functions for MAAS network customization
-#
-
-#Below function will mark the interfaces in Auto mode to enbled by MAAS
-# using hostname of the node added into MAAS
-enableautomodebyname() {
- API_KEY=`sudo maas-region apikey --username=ubuntu`
- maas login $PROFILE $API_SERVERMAAS $API_KEY
-
- if [ ! -z "$4" ]; then
- for i in `seq 1 7`;
- do
- nodes=$(maas $PROFILE nodes read | jq -r '.[].system_id')
- if [ ! -z "$nodes" ]; then
- maas $PROFILE interface link-subnet $nodes $1 mode=$2 subnet=$3 || true
- fi
- done
- fi
-}
-
-#Below function will create vlan and update interface with the new vlan
-# will return the vlan id created
-crvlanupdsubnet() {
- API_KEY=`sudo maas-region apikey --username=ubuntu`
- maas login $PROFILE $API_SERVERMAAS $API_KEY
-
- # TODO: fix subnet creation and use 'jq'
- newvlanid=`maas $PROFILE vlans create $2 name=$3 vid=$4 | grep resource | cut -d '/' -f 6 `
- maas $PROFILE subnet update $5 vlan=$newvlanid
- eval "$1"="'$newvlanid'"
-}
-
-#Below function will create interface with new vlan and bind to physical interface
-crnodevlanint() {
- API_KEY=`sudo maas-region apikey --username=ubuntu`
- maas login $PROFILE $API_SERVERMAAS $API_KEY
-
- for node in $(maas $PROFILE nodes read | jq -r '.[].system_id')
- do
- 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
- }
-
-#function for JUJU envronment
-
addcredential() {
API_KEY=`sudo maas-region apikey --username=ubuntu`
controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
juju add-cloud $cloudname maas-cloud.yaml --replace
}
-#
-# VLAN customization
-#
-
-case "$labname" in
- 'intelpod9' )
- maas refresh
- crvlanupdsubnet vlan904 fabric-1 "MgmtNetwork" 904 2 || true
- crvlanupdsubnet vlan905 fabric-2 "PublicNetwork" 905 3 || true
- crnodevlanint $vlan905 eth1 || 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
-
#
# Enable MAAS nodes interfaces
#
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 )
+ IF_LIST=$(cat labconfig.json | jq --raw-output ".lab.racks[0].nodes[$NODE_ID].nics[] ".ifname | sort -u )
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[])
+ SUBNET_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="'$IF_SPACE'")'.cidr | cut -d \" -f 2 `
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' ;;
+ 'data') IF_MODE='AUTO' ;;
+ 'public') IF_MODE='AUTO' ;;
+ 'storage') IF_MODE='AUTO' ;;
+ 'floating') IF_MODE='link_up' ;;
*) SUBNET_CIDR='null'; IF_MODE='null'; echo " >>> Unknown SPACE" ;;
esac
echo " >>> Configuring interface $IF_NAME [$IF_SPACE][$SUBNET_CIDR]"
# 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)
- maas $PROFILE interface update $NODE_SYS_ID $IF_ID name=$IF_NEWNAME
- IF_NAME=$IF_NEWNAME
- fi
-
# In case of a VLAN interface
if ([ $IF_VLAN ] && [ "$IF_VLAN" != "null" ]); then
echo " >>> Configuring VLAN $IF_VLAN"
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
+ else
+ # 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 $PROFILE 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
+ fi
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
+ maas $PROFILE interface update $NODE_SYS_ID $IF_NAME vlan=$VLANID || true
fi
maas $PROFILE interface link-subnet $NODE_SYS_ID $IF_NAME mode=$IF_MODE subnet=$SUBNET_CIDR || true
sleep 2
Code Review / joid.git / blobdiff