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
#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
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 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
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')
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.
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
}
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
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
}
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
}
juju add-cloud $cloudname maas-cloud.yaml --replace
}
-
#
# VLAN customization
#
#
#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