summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-08-14 14:52:56 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2017-08-14 14:52:56 -0500
commitbc31d3dd92b8c9fd4a296bf46c879398be9cdefb (patch)
tree2bde1765e27e756b2aa280eb146d27c57151dfe4
parent320c0ccb146a27ecaa9338e0f51de3eee64602c9 (diff)
Adding the support of management netwok for pxe boot only.
Change-Id: Ice8bcbc26003efd53c50972742a53c7858e8deec Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rwxr-xr-xci/03-maasdeploy.sh32
1 files changed, 21 insertions, 11 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index 1c19a63c..6d33691e 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -233,9 +233,9 @@ configuremaas(){
#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 admin \
- tenant-data tenant-api tenant-public
+ for space in unused admin-api internal-api public-api \
+ storage-access storage-cluster admin \
+ tenant-data tenant-api tenant-public oam-space
do
echo_info "Creating the space $space"
maas $PROFILE spaces create name=$space || true
@@ -259,7 +259,7 @@ configuremaas(){
setupspacenetwork(){
#get space, subnet and vlan and create accordingly.
- #for type in admin data storage external floating public; do
+ #for type in pxe 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
@@ -313,11 +313,12 @@ setupspacenetwork(){
fi
fi
case "$type" in
+ 'pxe') JUJU_SPACE="oam-space"; DHCP='enabled' ;;
'admin') JUJU_SPACE="internal-api"; DHCP='enabled' ;;
'data') JUJU_SPACE="tenant-data"; DHCP='' ;;
'public') JUJU_SPACE="public-api"; DHCP='' ;;
'storage') JUJU_SPACE="storage-cluster"; DHCP='' ;;
- 'storageaccess') JUJU_SPACE="storage-data"; DHCP='' ;;
+ 'storageaccess') JUJU_SPACE="storage-data"; DHCP='' ;;
'floating') JUJU_SPACE="tenant-public"; DHCP='' ;;
*) JUJU_SPACE='default'; DHCP='OFF'; echo_info " >>> Unknown SPACE" ;;
esac
@@ -329,7 +330,7 @@ setupspacenetwork(){
maas $PROFILE vlan update $NET_FABRIC_ID $JUJU_VLAN_VID space=$JUJU_SPACE_ID
fi
fi
- if ([ $type == "admin" ]); then
+ if ([ $type == "admin" ] || [ $type == "pxe" ]); then
# If we have a network, we create it
if ([ $NET_FABRIC_ID ]); then
# Set ranges
@@ -386,9 +387,10 @@ addnodes(){
brid=`brctl show | grep 8000 | cut -d "8" -f 1 | tr "\n" " " | tr " " " " | tr -s " "`
ADMIN_BR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="admin")'.bridge | cut -d \" -f 2 `
+ PXE_BR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="admin")'.bridge | cut -d \" -f 2 `
for feature in $brid; do
- if [ "$feature" == "$ADMIN_BR" ]; then
+ if ([ "$feature" == "$ADMIN_BR" ] || [ "$feature" == "$PXE_BR" ]); then
netw=$netw" --network bridge="$feature",model=virtio"
else
netw=$netw
@@ -465,6 +467,7 @@ addnodes(){
units=$(($units - 1));
NODE_NAME=`cat labconfig.json | jq ".lab.racks[].nodes[$units].name" | cut -d \" -f 2 `
MAC_ADDRESS=`cat labconfig.json | jq ".lab.racks[].nodes[$units].nics[] | select(.spaces[]==\"admin\").mac"[0] | cut -d \" -f 2 `
+ MAC_ADDRESS_PXE=`cat labconfig.json | jq ".lab.racks[].nodes[$units].nics[] | select(.spaces[]==\"pxe\").mac"[0] | cut -d \" -f 2 `
#MAC_ADDRESS1=`cat labconfig.json | jq ".lab.racks[].nodes[$units].nics[] | select(.spaces[]==\"floating\").mac"[0] | cut -d \" -f 2 `
POWER_TYPE=`cat labconfig.json | jq ".lab.racks[].nodes[$units].power.type" | cut -d \" -f 2 `
POWER_IP=`cat labconfig.json | jq ".lab.racks[].nodes[$units].power.address" | cut -d \" -f 2 `
@@ -483,10 +486,17 @@ addnodes(){
NODE_ARC="$NODE_ARCHES/generic"
echo_info "Creating node $NODE_NAME"
- maas $PROFILE machines create autodetect_nodegroup='yes' name=$NODE_NAME \
- hostname=$NODE_NAME power_type=$POWER_TYPE power_parameters_power_address=$POWER_IP \
- power_parameters_power_user=$POWER_USER power_parameters_power_pass=$POWER_PASS \
- mac_addresses=$MAC_ADDRESS architecture=$NODE_ARC
+ if ([ $MAC_ADDRESS_PXE ] && ["$MAC_ADDRESS_PXE" != "null" ]); then
+ maas $PROFILE machines create autodetect_nodegroup='yes' name=$NODE_NAME \
+ hostname=$NODE_NAME power_type=$POWER_TYPE power_parameters_power_address=$POWER_IP \
+ power_parameters_power_user=$POWER_USER power_parameters_power_pass=$POWER_PASS \
+ mac_addresses=$MAC_ADDRESS_PXE architecture=$NODE_ARC
+ else
+ maas $PROFILE machines create autodetect_nodegroup='yes' name=$NODE_NAME \
+ hostname=$NODE_NAME power_type=$POWER_TYPE power_parameters_power_address=$POWER_IP \
+ power_parameters_power_user=$POWER_USER power_parameters_power_pass=$POWER_PASS \
+ mac_addresses=$MAC_ADDRESS architecture=$NODE_ARC
+ fi
done
fi