Merge lp:~cpe-sa/obinstall/misc-next-fixes into lp:obinstall/next

[Craig Bender]

Fix grep errors where multiple macs or system ids were returned
Enlist VMs by using chassis vs machine
Commission all VMs at once
Create three zones so things like sharding swift work better
Add jq to OB Package list

[lp:~cpe-sa/obinstall/misc-next-fixes]

25. By Craig Bender on 2017-03-08

Fix a couple errors with 04 script

26. By Craig Bender on 2017-03-08

Add sleep after adding chassis so machines show up before attempting other operations

27. By Craig Bender on 2017-03-09

Juju 2.1 seems to have a problem bootstraping with the current obvm disk config (20+2). Removing 2 GB disk and also setting disk controller to scsi

[Michael Iatrou (michael.iatrou)]

This patch mixes whitespace adjustments with actual code changes, which is problematic to the review. Consider one patchset for fixes/enhancements, and a separate one for trivial whitespace changes.

[Fatih Nar (fenar-e)]

Thanks for Hard Work!

review: Approve

[Craig Bender (craig-bender)]

True for the 04-add script, but that's when I was trying to figure out when
juju wouldn't bootstrap. There is some code changes in 04, that if left
unchanged, breaks the ability to add vms. Mainly around grep returning
multiple mac and system ids.

On Thu, Mar 9, 2017 at 6:04 AM, Michael Iatrou <<email address hidden>
> wrote:

> This patch mixes whitespace adjustments with actual code changes, which is
> problematic to the review. Consider one patchset for fixes/enhancements,
> and a separate one for trivial whitespace changes.
> --
> https://code.launchpad.net/~cpe-sa/obinstall/misc-next-fixes/+merge/319374
> Your team CPE SA is requested to review the proposed merge of
> lp:~cpe-sa/obinstall/misc-next-fixes into lp:obinstall/next.
>

--
*Craig Bender*
Solutions Architect
*Canonical*
Direct Dial: [phone]
Ubuntu - Linux for Human Beings
www.canonical.com - www.ubuntu.com

[Michael Iatrou (michael.iatrou)]

Running 05-add_physical_nodes.sh fails with the following error:

+ [[ 08 -lt 4 ]]
./05-add_physical_nodes.sh: line 78: [[: 08: value too great for base (error token is "08")
+ [[ 08 -ge 4 ]]
./05-add_physical_nodes.sh: line 80: [[: 08: value too great for base (error token is "08")
+ [[ 08 -ge 7 ]]
./05-add_physical_nodes.sh: line 82: [[: 08: value too great for base (error token is "08")
./05-add_physical_nodes.sh: line 85: zone: unbound variable

This happens because of the conversion in line 58.

Please also consider splitting the patch in two, separating functional changes from white space changes (ideally in that order).

review: Needs Fixing

[lp:~cpe-sa/obinstall/misc-next-fixes]

28. By Craig Bender on 2017-03-10

Fixed hasty zone decision stanza, removed unholy trinity of echo+grep+cut

[Michael Iatrou (michael.iatrou)]

Just attempted to review network/network-mode.sh
Color-coding the script output makes it pretty, but it makes reading the script itself very painful.
Highly recommended to revert it!

[Craig Bender (craig-bender)]

Really? Color coding is only in the printf statements, nothing that
actually runs code.

I don't get why we seem to like set -x and no error handling as
opposed to making things look presentable and gives easy to understand
feedback. I have a source file that I can change the escape sequences
to variables which can make things easier to read since it's less
characters.

On Thu, Mar 16, 2017 at 5:22 AM, Michael Iatrou
<email address hidden> wrote:
> Just attempted to review network/network-mode.sh
> Color-coding the script output makes it pretty, but it makes reading the script itself very painful.
> Highly recommended to revert it!
> --
> https://code.launchpad.net/~cpe-sa/obinstall/misc-next-fixes/+merge/319374
> Your team CPE SA is subscribed to branch lp:obinstall/next.

--
Craig Bender
Solutions Architect
Canonical
Direct Dial: [phone]
Ubuntu - Linux for Human Beings
www.canonical.com - www.ubuntu.com

[Matt Jarvis (matt-jarvis)]

Totally agree with you re error handling and set -x, thats definitely on
the list of things to fix through our working group. Ideally I'd also like
to standardise on output formatting so perhaps that piece might be best
left until we decide as a group what our direction of travel should be. If
non-functional changes make code harder to review and maintain, then I'd
suggest Michael makes a valid point.

On 16 Mar 2017 17:03, "Craig Bender" <email address hidden> wrote:

Really? Color coding is only in the printf statements, nothing that
actually runs code.

I don't get why we seem to like set -x and no error handling as
opposed to making things look presentable and gives easy to understand
feedback. I have a source file that I can change the escape sequences
to variables which can make things easier to read since it's less
characters.

On Thu, Mar 16, 2017 at 5:22 AM, Michael Iatrou
<email address hidden> wrote:
> Just attempted to review network/network-mode.sh
> Color-coding the script output makes it pretty, but it makes reading the
script itself very painful.
> Highly recommended to revert it!
> --
> https://code.launchpad.net/~cpe-sa/obinstall/misc-next-fixes/+merge/319374
> Your team CPE SA is subscribed to branch lp:obinstall/next.

--
Craig Bender
Solutions Architect
Canonical
Direct Dial: [phone]
Ubuntu - Linux for Human Beings
www.canonical.com - www.ubuntu.com

https://code.launchpad.net/~cpe-sa/obinstall/misc-next-fixes/+merge/319374
You are subscribed to branch lp:obinstall/next.

[Craig Bender (craig-bender)]

So if someone doesn't understand jq, does that mean the code is harder
to review if it spawns three processes, like awk + sed + grep, to get
the same info?

I thought the point here was to make the scripts better. Better in my
mind means it's easier for the end user to determine what is
happening.

Better will definitely mean that reviewers have to learn something
new. Where some see \e[1m I see "bold", or green, or underline.

At any rate, I'll resubmit, but formatting after the fact is messy and
most likely will never get done.

On Thu, Mar 16, 2017 at 9:45 AM, Matt Jarvis <email address hidden> wrote:
> Totally agree with you re error handling and set -x, thats definitely on
> the list of things to fix through our working group. Ideally I'd also like
> to standardise on output formatting so perhaps that piece might be best
> left until we decide as a group what our direction of travel should be. If
> non-functional changes make code harder to review and maintain, then I'd
> suggest Michael makes a valid point.
>
> On 16 Mar 2017 17:03, "Craig Bender" <email address hidden> wrote:
>
> Really? Color coding is only in the printf statements, nothing that
> actually runs code.
>
> I don't get why we seem to like set -x and no error handling as
> opposed to making things look presentable and gives easy to understand
> feedback. I have a source file that I can change the escape sequences
> to variables which can make things easier to read since it's less
> characters.
>
> On Thu, Mar 16, 2017 at 5:22 AM, Michael Iatrou
> <email address hidden> wrote:
>> Just attempted to review network/network-mode.sh
>> Color-coding the script output makes it pretty, but it makes reading the
> script itself very painful.
>> Highly recommended to revert it!
>> --
>> https://code.launchpad.net/~cpe-sa/obinstall/misc-next-fixes/+merge/319374
>> Your team CPE SA is subscribed to branch lp:obinstall/next.
>
>
>
> --
> Craig Bender
> Solutions Architect
> Canonical
> Direct Dial: [phone]
> Ubuntu - Linux for Human Beings
> www.canonical.com - www.ubuntu.com
>
> https://code.launchpad.net/~cpe-sa/obinstall/misc-next-fixes/+merge/319374
> You are subscribed to branch lp:obinstall/next.
>
> --
> https://code.launchpad.net/~cpe-sa/obinstall/misc-next-fixes/+merge/319374
> Your team CPE SA is subscribed to branch lp:obinstall/next.

--
Craig Bender
Solutions Architect
Canonical
Direct Dial: [phone]
Ubuntu - Linux for Human Beings
www.canonical.com - www.ubuntu.com

[lp:~cpe-sa/obinstall/misc-next-fixes]

29. By Craig Bender on 2017-03-16

Remove color coding

30. By Craig Bender on 2017-03-16

Remove stray ctrl character

[Michael Iatrou (michael.iatrou)]

The scripts should have two goals:
1. Make it easy to use them and diagnose problems.
2. Make it easy to read, debug and expand.

The suggestion is that we clearly report issues during the execution of a script without the use of -x and without color coding.
In terms of readability, ${0##*/} is an unnecessary obfuscation, 'basename' offers the same functionality, it's less typo prone and less esoteric.
On the other hand, jq has an advantage over grep + awk + ... both in terms of readability *and* correctness, thumbs up!

[Craig Bender (craig-bender)]

We can debate the esoteric nature and correctness of built-in bash
parameter expansion/substitution vs launching a separate processes
over beers. ;)

On Thu, Mar 16, 2017 at 10:47 AM, Michael Iatrou
<email address hidden> wrote:
> The scripts should have two goals:
> 1. Make it easy to use them and diagnose problems.
> 2. Make it easy to read, debug and expand.
>
> The suggestion is that we clearly report issues during the execution of a script without the use of -x and without color coding.
> In terms of readability, ${0##*/} is an unnecessary obfuscation, 'basename' offers the same functionality, it's less typo prone and less esoteric.
> On the other hand, jq has an advantage over grep + awk + ... both in terms of readability *and* correctness, thumbs up!
>
> --
> https://code.launchpad.net/~cpe-sa/obinstall/misc-next-fixes/+merge/319374
> Your team CPE SA is subscribed to branch lp:obinstall/next.

--
Craig Bender
Solutions Architect
Canonical
Direct Dial: [phone]
Ubuntu - Linux for Human Beings
www.canonical.com - www.ubuntu.com

[Matt Jarvis (matt-jarvis)]

Great thread :) One of our goals should also definitely be to engender a
culture amongst this group where we can strongly debate all of these
positions whilst maintaining focus on what our end goals are. I think its
worth defining amongst ourselves exactly what our end goals are for
starting to do this work, so we can refer back to that wherever we have
conflicting positions.

On 16 Mar 2017 18:57, "Craig Bender" <email address hidden> wrote:

We can debate the esoteric nature and correctness of built-in bash
parameter expansion/substitution vs launching a separate processes
over beers. ;)

On Thu, Mar 16, 2017 at 10:47 AM, Michael Iatrou
<email address hidden> wrote:
> The scripts should have two goals:
> 1. Make it easy to use them and diagnose problems.
> 2. Make it easy to read, debug and expand.
>
> The suggestion is that we clearly report issues during the execution of a
script without the use of -x and without color coding.
> In terms of readability, ${0##*/} is an unnecessary obfuscation,
'basename' offers the same functionality, it's less typo prone and less
esoteric.
> On the other hand, jq has an advantage over grep + awk + ... both in
terms of readability *and* correctness, thumbs up!
>
> --
> https://code.launchpad.net/~cpe-sa/obinstall/misc-next-fixes/+merge/319374
> Your team CPE SA is subscribed to branch lp:obinstall/next.

--
Craig Bender
Solutions Architect
Canonical
Direct Dial: [phone]
Ubuntu - Linux for Human Beings
www.canonical.com - www.ubuntu.com

https://code.launchpad.net/~cpe-sa/obinstall/misc-next-fixes/+merge/319374
You are subscribed to branch lp:obinstall/next.

Unmerged revisions

30. By Craig Bender on 2017-03-16

Remove stray ctrl character

29. By Craig Bender on 2017-03-16

Remove color coding

28. By Craig Bender on 2017-03-10

Fixed hasty zone decision stanza, removed unholy trinity of echo+grep+cut

27. By Craig Bender on 2017-03-09

Juju 2.1 seems to have a problem bootstraping with the current obvm disk config (20+2). Removing 2 GB disk and also setting disk controller to scsi

26. By Craig Bender on 2017-03-08

Add sleep after adding chassis so machines show up before attempting other operations

25. By Craig Bender on 2017-03-08

Fix a couple errors with 04 script

24. By Craig Bender on 2017-03-08

Fix several grep errors that were returning multiple macs,system ids, etc, add vms via chassis vs machines, add jq to package list

23. By Craig Bender on 2017-03-06

Add changing mikrotik /ip address vlans as appropriate for single or dual mode

22. By Craig Bender on 2017-03-06

Check for existing links before updating link to subnet, otherwise an alias gets created

21. By Craig Bender on 2017-03-06

Fixed network mode script

=== modified file '03-maas_setup_environment.sh'
--- 03-maas_setup_environment.sh	2016-09-20 09:23:07 +0000
+++ 03-maas_setup_environment.sh	2017-03-16 17:32:27 +0000
@@ -48,7 +48,7 @@
 #Create the MAAS credentials
 if [[ $(maas-region apikey --username admin 1>/dev/null 2>&1;echo $?) -eq 1 ]]
 then
-	maas-region createadmin --username admin --email [e-mail] --password="admin" || true
+    maas-region createadmin --username admin --email [e-mail] --password="admin" || true
 fi
 
 #get apikey variable
@@ -64,12 +64,12 @@
 maas admin ipranges create type=dynamic start_ip=${dhcp_low} end_ip=${dhcp_high}
 maas admin subnets read|grep "\"id\""|awk '{print $2}'|sed 's/,//'|egrep -x '.{1,2}'|while read subnet_id
 do
-	maas admin subnet read $subnet_id|grep "\"cidr\": \"${sub_net}\"" 1>/dev/null
-	if [[ $? -eq 0 ]]
-	then
-       		maas_fabric=$(maas admin subnet read ${subnet_id}|grep fabric|awk '{print $2}'|sed 's/,//'|sed 's/\"//g')
-		maas admin vlan update ${maas_fabric} untagged dhcp_on=True primary_rack="OrangeBox${ob_number}"
-	fi
+    maas admin subnet read $subnet_id|grep "\"cidr\": \"${sub_net}\"" 1>/dev/null
+    if [[ $? -eq 0 ]]
+    then
+               maas_fabric=$(maas admin subnet read ${subnet_id}|grep fabric|awk '{print $2}'|sed 's/,//'|sed 's/\"//g')
+        maas admin vlan update ${maas_fabric} untagged dhcp_on=True primary_rack="OrangeBox${ob_number}"
+    fi
 done
 maas admin subnet update ${sub_net} gateway_ip=${gateway_ip} dns_servers=${dns_servers}
 
@@ -96,5 +96,7 @@
 sleep 5
 
 #Add zones to MAAS for NUC's
-maas admin zone read zone1 || maas admin zones create name=zone1 description="Physical machines 1-5"
-maas admin zone read zone2 || maas admin zones create name=zone2 description="Physical machines 6-10"
+maas admin zone read zone0 || maas admin zones create name=zone0 description="Virtual Machines"
+maas admin zone read zone1 || maas admin zones create name=zone1 description="Physical machines 1-3"
+maas admin zone read zone2 || maas admin zones create name=zone2 description="Physical machines 4-6"
+maas admin zone read zone3 || maas admin zones create name=zone3 description="Physical machines 7-10"

=== modified file '04-add_virtual_nodes.sh'
--- 04-add_virtual_nodes.sh	2016-09-20 09:23:07 +0000
+++ 04-add_virtual_nodes.sh	2017-03-16 17:32:27 +0000
@@ -100,22 +100,26 @@
 maas admin zone read zone0 || maas admin zones create name=zone0 description="Virtual machines on node0"
 
 for i in {0..2}; do
-	hostname="node00vm${i}ob${orangebox_number}.maas"
+	hostname="node00vm${i}ob${orangebox_number}"
 	virsh destroy $hostname || true
 	virsh undefine $hostname || true
 	echo "INFO: Installing virtual machine"
         if [ $i = 0 ]; then
-	virt-install --debug --name $hostname --ram 6144 --disk=path=/srv/obvms/${hostname}-1.img,size=20 --disk=path=/srv/obvms/${hostname}-2.img,size=2 --vcpus=2 --os-type=linux --pxe --network=bridge=br0 --network=bridge=br0 --boot network --video=cirrus --graphics vnc|| true
+	virt-install --noautoconsole --print-xml --name=$hostname --controller=scsi --ram=8192 --disk=path=/srv/obvms/${hostname}-1.img,bus=scsi,size=20 --vcpus=2 --network=bridge=br0 --network=bridge=br1 --boot=network --video=cirrus --graphics=vnc > /srv/obvms/${hostname}.xml|| true
         else
-	virt-install --debug --name $hostname --ram 4096 --disk=path=/srv/obvms/${hostname}-1.img,size=20 --disk=path=/srv/obvms/${hostname}-2.img,size=2 --vcpus=2 --os-type=linux --pxe --network=bridge=br0 --network=bridge=br0 --boot network --video=cirrus --graphics vnc|| true
+	virt-install --noautoconsole --print-xml --name=$hostname --controller=scsi --ram 4096 --disk=path=/srv/obvms/${hostname}-1.img,bus=scsi,size=20 --vcpus=2 --network=bridge=br0 --network=bridge=br1 --boot=network --video=cirrus --graphics=vnc > /srv/obvms/${hostname}.xml|| true
         fi
-	virsh console $hostname || true
+	virsh define /srv/obvms/${hostname}.xml
 	virsh autostart $hostname
-	mac=$(virsh dumpxml $hostname | python -c 'import sys, lxml.etree; print list(lxml.etree.parse(sys.stdin).iter("mac"))[0].get("address")')
-	system_id=$(maas admin nodes read mac_address=$mac | grep system_id | cut -d'"' -f4)
-
+done
+unset i
+printf "\nAdding virsh power chassis to MaaS...\n"
+maas admin  machines add-chassis hostname=qemu+ssh://ubuntu@172.27.${orangebox_number}.1/system chassis_type=virsh prefix_filter='node00vm' 
+sleep 3
+for i in {0..2}; do
+        hostname="node00vm${i}ob${orangebox_number}"
+	system_id=$(maas admin machines read | jq -r '.[]|select(.hostname=="'${hostname}'")|.system_id')
 	if [ -n "$system_id" ]; then
-		maas admin machine update $system_id hostname=$hostname power_type=virsh power_parameters_power_address=qemu+ssh://ubuntu@${internal_ip}/system power_parameters_power_id=$hostname
 		maas admin tag update-nodes "virtual" add=$system_id
 		case $i in
 			0)
@@ -126,10 +130,13 @@
 			;;
 		esac
 		maas admin tag update-nodes use-fastpath-installer add=$system_id
-		maas admin machine commission $system_id || true
 		maas admin nodes set-zone zone=zone0 nodes=$system_id
 	else
 		echo "ERROR: Could not find virtual machine in MAAS" 1>&2
 		exit 1
 	fi
 done
+unset i
+printf '\nCommissioning virtual nodes...\n'
+maas admin machines accept-all
+

=== modified file '04a-mod_virtual_nodes.sh'
--- 04a-mod_virtual_nodes.sh	2016-09-20 09:23:07 +0000
+++ 04a-mod_virtual_nodes.sh	2017-03-16 17:32:27 +0000
@@ -40,7 +40,7 @@
 
 for i in {0..2}; do
 	hostname="node00vm${i}ob${orangebox_number}"
-	system_id=$(maas admin nodes read hostname=${hostname} |grep system_id | cut -d'"' -f4)
+	system_id=$(maas admin nodes read hostname=${hostname} |grep -m1 system_id | cut -d'"' -f4)
         sub_net="172.27.$(expr ${orangebox_number} + 2).0/23"
 	eth1_set=$(maas admin interface read $system_id eth1|grep "\"cidr\": \"${sub_net}\"" 1>/dev/null 2>&1; echo $?) #0=already set, 1=needs setting
 	maas admin subnets read|grep "\"id\""|awk '{print $2}'|sed 's/,//'|egrep -x '.{1,2}'|while read subnet_id

=== modified file '05-add_physical_nodes.sh'
--- 05-add_physical_nodes.sh	2016-12-07 17:37:21 +0000
+++ 05-add_physical_nodes.sh	2017-03-16 17:32:27 +0000
@@ -21,68 +21,67 @@
 set -aux
 
 # If user is not root then exit
-if [ "$(id -u)" != "0" ]; then
-  echo "Must be run with sudo or by root"
-  exit 77
-fi
+[[ "$(id -u)" != "0" ]] && { echo "Must be run with sudo or by root";exit 77; }
 
+[[ -f /var/log/${0##*/}.log ]] && { touch /var/log/${0##*/}.log;chmod a+rw /var/log/${0##*/}.log; }
+printf "Running ${0##*/}...\n" >> /var/log/${0##*/}.log 2>&1
+command -v jq >> /var/log/${0##*/}.log 2>&1 || apt install jq -y >> /var/log/${0##*/}.log 2>&1
 # Get ob number
 #
-ob_number=`hostname | cut -c 10- -`
+OB_NUM=${HOSTNAME:9}
 
 # Ensure the MAAS URL and CLUSTER UUID are set correctly
-MAAS_URL=http://172.27.${ob_number}.1/MAAS
-CLUSTER_UUID=`grep cluster_uuid /etc/maas/rackd.conf |awk '{print $2}'`
+MAAS_URL=http://172.27.${OB_NUM}.1/MAAS
+CLUSTER_UUID=$(awk '/cluster_uuid/{print $2}' /etc/maas/rackd.conf)
 
 # AMT Password set
 AMT_PASSWORD=Password1+
 
-# set apikey variable
-apikey=`maas-region apikey --username admin | tail -n1`
+# set MAAS_APIKEY variable
+MAAS_APIKEY=$(maas apikey --username admin)
 
 # login to MAAS
-maas login admin $MAAS_URL $apikey
+maas login admin $MAAS_URL $MAAS_APIKEY >> /var/log/${0##*/}.log 2>&1
+
+#Add tags to MAAS if not already there
+maas admin tags create name=physical >> /var/log/${0##*/}.log 2>&1
+maas admin tags create name=use-fastpath-installer >> /var/log/${0##*/}.log 2>&1
 
 # Add nodes to MAAS by accessing their amt interfaces
-for amtnum in {11..20}
-do
-ping -c 2 172.27.${ob_number}.${amtnum}
-
-# Get mac address for the corresponding amt ip address
-mac=`arp -n | grep 172.27.${ob_number}.$amtnum |awk '{print $3}'`
-echo "$mac belongs to node${amtnum}ob${ob_number} with ip 172.27.${ob_number}.${amtnum}"
-
-# Get the node number for the name out of the amt ip address
-nodenum=`expr ${amtnum} - 10`
-if [ ${nodenum} -lt 10 ]; then
-     nodenum="0${nodenum}"
-fi
-echo "The name of the node is node${nodenum}ob${ob_number}"
-
-# Add each node to MAAS and commission it
-maas admin machines create architecture=amd64 power_type=amt power_parameters_power_address=172.27.${ob_number}.${amtnum} power_parameters_power_pass=Password1+ mac_addresses=${mac} hostname=node${nodenum}ob${ob_number}
-
-#Add tags to MAAS if not already there
-maas admin tags create name=physical || true
-maas admin tags create name=use-fastpath-installer || true
-
-#Get the system id of each node
-system_id=$(maas admin nodes read mac_address=$mac | grep system_id | cut -d'"' -f4)
-echo $system_id
-
-#Assign tags to each node
-maas admin tag update-nodes "physical" add=$system_id
-maas admin tag update-nodes "use-fastpath-installer" add=$system_id
-
-#Determine which zone a node will be in
-if [ ${nodenum} -lt 6 ]; then
-                zone="zone1"
-        else
-                zone="zone2"
-fi
-echo "Node node${nodenum}ob${ob_number} is in $zone"
-
-#Add the nodes to their respective zone
-maas admin nodes set-zone zone=$zone nodes=$system_id
-
+for AMT_NUM in {11..20};do
+    ping -c2 172.27.${OB_NUM}.${AMT_NUM} >> /var/log/${0##*/}.log 2>&1
+
+    # Get MAC address for the corresponding amt ip address
+    MAC=$(arp -n |awk  '/\<172.27.'${OB_NUM}.${AMT_NUM}'\>/{print $3;exit}')
+    echo "${MAC} belongs to node${AMT_NUM}ob${OB_NUM} with ip 172.27.${OB_NUM}.${AMT_NUM}"
+
+    # Get the node number for the name out of the amt ip address
+    NODE_NUM=$((${AMT_NUM}-10))
+    [[ ${NODE_NUM} -lt 10 ]] && NODE_NUM="0${NODE_NUM}"
+    NODE_NAME="node${NODE_NUM}ob${OB_NUM}"
+    echo "The name of the node is ${NODE_NAME}"
+
+    # Add each node to MAAS and commission it
+    maas admin machines create architecture=amd64 power_type=amt power_parameters_power_address=172.27.${OB_NUM}.${AMT_NUM} power_parameters_power_pass=Password1+ mac_addresses=${MAC} hostname=${NODE_NAME} >> /var/log/${0##*/}.log 2>&1
+
+
+
+    #Get the system id of each node
+    SYS_ID=$(maas admin nodes read mac_address=${MAC}|jq -r '.[]|.system_id')
+    echo ${SYS_ID}
+
+    #Assign tags to each node
+    maas admin tag update-nodes "physical" add=${SYS_ID} >> /var/log/${0##*/}.log 2>&1
+    maas admin tag update-nodes "use-fastpath-installer" add=${SYS_ID} >> /var/log/${0##*/}.log 2>&1
+
+    #Determine which zone a node will be in
+    [[ $((10#${NODE_NUM})) -le 3 ]] && export ZONE=zone1
+    [[ $((10#${NODE_NUM})) -gt 3 ]] && [[ $((10#${NODE_NUM})) -le 6 ]] && export ZONE=zone2
+    [[ $((10#${NODE_NUM})) -gt 6 ]] && [[ $((10#${NODE_NUM})) -le 10 ]] && export ZONE=zone3
+    echo "Node ${NODE_NAME} is in ${ZONE}"
+
+    #Add the nodes to their respective zone
+    maas admin nodes set-zone zone=${ZONE} nodes=${SYS_ID} >> /var/log/${0##*/}.log 2>&1
+    unset MAC SYS_ID ZONE NODE_NAME
 done
+unset AMT_NUM AMT_PASSWORD CLUSTER_UUID

=== modified file '05a-mod_physical_nodes.sh'
--- 05a-mod_physical_nodes.sh	2016-09-20 09:23:07 +0000
+++ 05a-mod_physical_nodes.sh	2017-03-16 17:32:27 +0000
@@ -47,28 +47,28 @@
 sub_net="172.27.$(expr ${ob_number} + 2).0/23"
 for nodenum in {01..10}
 do
-	interface=$(maas admin nodes read hostname=node${nodenum}ob${ob_number} |grep enx | cut -d '"' -f4)
-	system_id=$(maas admin nodes read hostname=node${nodenum}ob${ob_number} |grep system_id | cut -d'"' -f4)
-	maas admin subnets read|grep "\"id\""|awk '{print $2}'|sed 's/,//'|egrep -x '.{1,2}'|while read subnet_id
-	do
-		maas admin subnet read $subnet_id|grep "\"cidr\": \"${sub_net}\"" 1>/dev/null
-       	 	if [[ $? -eq 0 ]]
-       	 	then
-                	maas_fabric=$(maas admin subnet read ${subnet_id}|grep fabric|awk '{print $2}'|sed 's/,//'|sed 's/\"//g')
-                	vlanid=$(maas admin vlans read ${maas_fabric} |grep id |grep -v vid | awk -F, '{print $1}'|awk '{print $2}')
-			if [[ -n ${interface} ]]
-			then
-     				maas admin interface update $system_id $interface name=eth1
-				maas admin interface update $system_id eth1 vlan=$vlanid
-                		maas admin interface link-subnet $system_id eth1 mode=auto subnet="$sub_net"	
-			else
-				eth1_set=$(maas admin interface read $system_id eth1|grep cidr 1>/dev/null 2>&1; echo $?) #0=already set, 1=needs setting
-				if [[ ${eth1_set} -eq 1 ]]
-				then
-					maas admin interface update $system_id eth1 vlan=$vlanid
-	                       	 	maas admin interface link-subnet $system_id eth1 mode=auto subnet="$sub_net"
-				fi
-			fi
-       	 	fi
-	done
+    interface=$(maas admin nodes read hostname=node${nodenum}ob${ob_number} |grep enx | cut -d '"' -f4)
+    system_id=$(maas admin nodes read hostname=node${nodenum}ob${ob_number} |grep -m1 system_id | cut -d'"' -f4)
+    maas admin subnets read|grep "\"id\""|awk '{print $2}'|sed 's/,//'|egrep -x '.{1,2}'|while read subnet_id
+    do
+        maas admin subnet read $subnet_id|grep "\"cidr\": \"${sub_net}\"" 1>/dev/null
+                if [[ $? -eq 0 ]]
+                then
+                    maas_fabric=$(maas admin subnet read ${subnet_id}|grep fabric|awk '{print $2}'|sed 's/,//'|sed 's/\"//g')
+                    vlanid=$(maas admin vlans read ${maas_fabric} |grep id |grep -v vid | awk -F, '{print $1}'|awk '{print $2}')
+            if [[ -n ${interface} ]]
+            then
+                     maas admin interface update $system_id $interface name=eth1
+                maas admin interface update $system_id eth1 vlan=$vlanid
+                        maas admin interface link-subnet $system_id eth1 mode=auto subnet="$sub_net"
+            else
+                eth1_set=$(maas admin interface read $system_id eth1|grep cidr 1>/dev/null 2>&1; echo $?) #0=already set, 1=needs setting
+                if [[ ${eth1_set} -eq 1 ]]
+                then
+                    maas admin interface update $system_id eth1 vlan=$vlanid
+                                    maas admin interface link-subnet $system_id eth1 mode=auto subnet="$sub_net"
+                fi
+            fi
+                fi
+    done
 done

=== modified file 'PACKAGES.list'
--- PACKAGES.list	2016-05-19 22:40:57 +0000
+++ PACKAGES.list	2017-03-16 17:32:27 +0000
@@ -1,3 +1,4 @@
+jq
 nmap
 bridge-utils
 amtterm

=== modified file 'network/network-mode.sh'
--- network/network-mode.sh	2016-08-04 05:00:27 +0000
+++ network/network-mode.sh	2017-03-16 17:32:27 +0000
@@ -1,10 +1,10 @@
 #!/bin/bash
-#version 0.1
+#version 0.2
 #
 #    Script to configure the switch to be a single or dual vlan
 #    Copyright (C) 2016 Canonical Ltd.
 #
-#    Authors: Gary MacKenzie <[e-mail]>
+#    Authors: Gary MacKenzie <[e-mail]>, Craig Bender <[e-mail]>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -19,138 +19,261 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# Get OrangeBox number
-#
-
-OB=`hostname | cut -c 10-`
-BYTE1=$(echo $OB | cut -c 1)
-BYTE2=$(echo $OB | cut -c 2-)
+TRUE=true
+FALSE=false
+command -v jq > /dev/null 2>&1 || sudo apt install jq -y
+command -v jq > /dev/null 2>&1 || { echo "This script requires jq";exit 1; }
+
+
+OB_NUM=${HOSTNAME:9}
+OB_LOG="/var/log/OrangeBox${OB_NUM}.log"
+[[ -f ${OB_LOG} ]] && sudo chmod a+w+r ${OB_LOG} || { sudo touch ${OB_LOG};sudo chmod a+w+r ${OB_LOG}; }
+
+BYTE1=${OB_NUM:0:1}
+BYTE2=${OB_NUM:1:2}
 
 # Parse the variables for the OrangeBox number to eliminate any zero's at the beginning of the number.
 #
-if [ $BYTE1 -eq 0 ]
-then
-        OB=$BYTE2
-fi
-
-# Set the network subnet variables
-#
-
-PLUS1=`expr $OB + 1`
-PLUS2=`expr $OB + 2`
-PLUS3=`expr $OB + 3`
-
-if (($# == 0)); then
-        echo "Usage: ./network_mode.sh mode
-Mode:
-  -s|--single-network	Configure primary and secondary interfaces on nodes 1-10 on a single VLAN
-  -d|--dual-network	Configure secondary interfaces on ndoes 1-10 on a second VLAN"
-        exit 2
-fi
+[[ $BYTE1 -eq 0 ]] && OB_NUM=$BYTE2
+
+OB_ROUTER="172.27.$((${OB_NUM}+1)).254"
+MTEK_IP_ID_1=$(ssh -o "StrictHostKeyChecking no" admin@${OB_ROUTER} /ip address print|awk '/172.27.'${OB_NUM}'.0/{print $1}')
+MTEK_IP_ID_2=$(ssh -o "StrictHostKeyChecking no" admin@${OB_ROUTER} /ip address print|awk '/172.27.'$((${OB_NUM}+2))'.0/{print $1}')
+
+# Set the MAAS URL for the admin login setup
+MAAS_URL=http://172.27.${OB_NUM}.1/MAAS
+[[ -z ${MAAS_PROFILE} ]] && MAAS_PROFILE=admin
+
+Usage() {
+local help='
+Usage: '${0##*/}' <options>
+
+Options:
+  -s|--single-network   Configure primary and secondary interfaces on nodes 1-10 on a single VLAN
+  -d|--dual-network     Configure secondary interfaces on ndoes 1-10 on a second VLAN
+  -f|--force            Run even if nodes are not in Ready state
+
+'
+echo "${help}"
+}
 
 SINGLENETWORK=0
 DUALNETWORK=0
+FORCE=0
+PARTIAL=0
+[[ -z ${1} ]] && { Usage;exit 2; }
 
-ARGS=`getopt -o sd --long single-network,dual-network -- "$@"`
+ARGS=`getopt -o sdf --long single-network,dual-network,force -- "$@"`
 eval set -- "$ARGS"
 
 while true ; do
     case "$1" in
         -s|--single-network)
-		SINGLENETWORK=1
-		shift
-		;;
+        SINGLENETWORK=1
+        shift
+        ;;
         -d|--dual-network) 
-		DUALNETWORK=1
-		shift
-		;;
-	--)
-		shift
-		break
-		;;
-        *) echo "Usage: ./network_mode.sh mode
-Mode:
-  -s|--single-network	Configure primary and secondary interfaces on nodes 1-10 on a single VLAN
-  -d|--dual-network	Configure secondary interfaces on ndoes 1-10 on a second VLAN"
-	   exit 2 ;;
+        DUALNETWORK=1
+        shift
+        ;;
+        -f|--force) 
+        FORCE=1
+        shift
+        ;;
+    --)
+        shift
+        break
+        ;;
+        */?) Usage;exit 2 ;;   
     esac
 done
 
-if [ "$SINGLENETWORK" -eq 1 ];
-then
-   echo "Configuring for 1 Network mode..."
-ssh -o "StrictHostKeyChecking no" admin@172.27.$PLUS1.254 /interface ethernet set master-port=ether2-master-local 4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
-
-echo
-echo "All ports configured for 1 network mode"
-   ssh -o "StrictHostKeyChecking no" admin@172.27.$PLUS1.254 /beep
-#Get Orangebox number from the hostname and place into the configuration file
-ob_number=`hostname | cut -c 10- -`
-
-# Set the MAAS URL for the admin login setup
-MAAS_URL=http://172.27.${ob_number}.1/MAAS
- 
-apikey=`sudo maas-region apikey --username admin | tail -n1`
-maas login admin $MAAS_URL $apikey
-
-declare maas_fabric=()
-for fab_ric in $(maas admin fabrics read |grep name|grep fabric|awk -F\" '{print $4}')
-do
-    echo "Fabric $fab_ric"
-    maas_fabric=("${maas_fabric[@]}" "$fab_ric")
-done
-
-vlanid=$(maas admin vlans read "${maas_fabric[1]}" |grep id |grep -v vid | awk -F, '{print $1}'|awk '{print $2}')
-sub_net="172.27.${ob_number}.0/23"
-
-for nodenum in {01..10}
-do
-     system_id=$(maas admin nodes read hostname=node${nodenum}ob${ob_number} |grep system_id | cut -d'"' -f4)
-     maas admin interface update $system_id eth1 vlan=$vlanid
-     maas admin interface link-subnet $system_id eth1 mode=auto subnet="$sub_net"
-done
-   exit
-fi
-
-if [ "$DUALNETWORK" -eq 1 ];
-then
-   echo "Configuring for 2 Network mode..."
-ssh -o "StrictHostKeyChecking no" admin@172.27.$PLUS1.254 /interface ethernet set master-port=ether1-master-local 4,6,8,10,12,14,16,18,20,22
-
-ssh -o "StrictHostKeyChecking no" admin@172.27.$PLUS1.254 /interface ethernet set master-port=ether2-master-local 5,7,9,11,13,15,17,19,21,23
-
-echo 
-echo "All ports configured for 2 network mode"
-   ssh -o "StrictHostKeyChecking no" admin@172.27.$PLUS1.254 /beep
-#Get Orangebox number from the hostname and place into the configuration file
-ob_number=`hostname | cut -c 10- -`
-
-# Set the MAAS URL for the admin login setup
-MAAS_URL=http://172.27.${ob_number}.1/MAAS
- 
-apikey=`sudo maas-region apikey --username admin | tail -n1`
-maas login admin $MAAS_URL $apikey
-
-declare maas_fabric=()
-for fab_ric in $(maas admin fabrics read |grep name|grep fabric|awk -F\" '{print $4}')
-do
-    echo "Fabric $fab_ric"
-    maas_fabric=("${maas_fabric[@]}" "$fab_ric")
-done
-
-vlanid=$(maas admin vlans read "${maas_fabric[2]}" |grep id |grep -v vid | awk -F, '{print $1}'|awk '{print $2}')
-sub_net="172.27.((ob_number+2)).0/23"
-
-# Configure second usb interface for second fabric and proper subnet
-#
-
-for nodenum in {01..10}
-do
-     system_id=$(maas admin nodes read hostname=node${nodenum}ob${ob_number} |grep system_id | cut -d'"' -f4)
-     maas admin interface update $system_id eth1 vlan=$vlanid
-     maas admin interface link-subnet $system_id eth1 mode=auto subnet="$sub_net"
-done
-echo "MAAS re-adjusted the nodes to work with dual vlan"
-sleep 5
-   exit
-fi
+[[ ${SINGLENETWORK} = 0 && ${DUALNETWORK} = 0  ]] && { printf "\nPlease select either -s or -d\n\n";Usage;exit 2; }
+[[ ${SINGLENETWORK} = 1 && ${DUALNETWORK} = 1  ]] && { printf "\nPlease select either -s or -d\n\n";Usage;exit 2; }
+
+MAAS_APIKEY=$(sudo maas apikey --username=${MAAS_PROFILE})
+[[ $? -eq 0 ]] || { echo "Failed to apikey for maas profile @ ${MAAS_PROFILE}";exit 1; }
+
+
+[[ $SINGLENETWORK -eq 1 ]] && printf "\nConfiguring OrangeBox${OB_NUM} for Single Network mode:\n"
+[[ $DUALNETWORK -eq 1 ]] && printf "\nConfiguring OrangeBox${OB_NUM} for Dual Network mode:\n"
+[[ ${FORCE} -eq 0 ]] ||    printf "\n\tForce mode selected\n"
+#Login to maas
+printf "\n\tLogging in as ${MAAS_PROFILE} to maas server @ ${MAAS_URL}..."
+maas login ${MAAS_PROFILE} ${MAAS_URL} ${MAAS_APIKEY} >> ${OB_LOG} 2>&1
+[[ $? -eq 0 ]] && printf " OK!\n\n" || { printf " FAILED!\n\nFailed to login in to maas server @ ${MAAS_URL}\n\n";exit 1; }
+printf "\n\tGetting state of nodes on OrangeBox${OB_NUM}\n\n"
+MAAS_MACHINE_STATES=$(maas admin machines read)
+[[ $? -eq 0 ]] || { printf " FAILED!\n\nFailed to get state of nodes from maas server @ ${MAAS_URL}\n\n";exit 1; }
+
+if [[ ${FORCE} -eq 0 ]];then
+
+
+    if [[ -n $(echo $MAAS_MACHINE_STATES|jq -r '.[]|.hostname+"\t"+.status_name'|sed -E -e '/vm|Ready/d') ]];then
+        printf "\n\tERROR: Interfaces cannot be changed unless nodes are in a \"Ready\" or \"Broken\" state\n\n"
+        printf "\t\tPlease ensure the all nodes are \"Ready\" and try again.\n\n"
+        echo $MAAS_MACHINE_STATES|jq -r '.[]|"\t\t"+.hostname+" \t"+.status_name'|sed '/node00vm/d'
+        printf "\n"
+        exit 3
+    else
+        echo $MAAS_MACHINE_STATES|jq -r '.[]|"\t\t"+.hostname+" \t"+.status_name'|sed '/node00vm/d'
+        printf "\n"
+    fi
+fi
+
+MAAS_SUB_NET_1="172.27.${OB_NUM}.0/23"
+MAAS_SUB_NET_2="172.27.$(($OB_NUM+2)).0/23"
+ETHER_1_OK=${FALSE}
+ETHER_2_OK=${FALSE}
+IP_1_VLAN_OK=${FALSE}
+IP_2_VLAN_OK==${FALSE}
+ETH1_PORTS="$(seq 4 2 22)"
+ETH2_PORTS="$(seq 5 2 23)"
+
+if [[ $SINGLENETWORK -eq 1 ]];then
+    
+    ssh -o "StrictHostKeyChecking no" admin@${OB_ROUTER} /interface ethernet set master-port=ether2-master-local 4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
+    [[ $? -eq 0 ]] && { printf "\tMikrotik: Successfully set master port to ether2-master-local for all ports\n"; } || { printf "\n Mikrotik:  Failed to set the master-port as ether2-master-local for all ports on the Mikrotik router\n\n";exit 1; }
+    
+    ssh -o "StrictHostKeyChecking no" admin@${OB_ROUTER} /ip address set ${MTEK_IP_ID_1} interface=vlan1
+    [[ $? -eq 0 ]] && IP_1_VLAN_OK=${TRUE} || IP_1_VLAN_OK=${FALSE}
+
+    ssh -o "StrictHostKeyChecking no" admin@${OB_ROUTER} /ip address set ${MTEK_IP_ID_2} interface=vlan1
+    [[ $? -eq 0 ]] && IP_2_VLAN_OK=${TRUE} || IP_1_VLAN_OK=${FALSE}
+    
+    [[ ${IP_1_VLAN_OK} = ${TRUE} ]] && { echo -e "\n\tMikrotik: Successfully set subnet ${MAAS_SUB_NET_1} to vlan1"; }
+    [[ ${IP_2_VLAN_OK} = ${TRUE} ]] && { echo -e "\n\tMikrotik: Successfully set subnet ${MAAS_SUB_NET_2} to vlan1"; }
+    [[ ${IP_1_VLAN_OK} = ${FALSE} ]] && { echo -e "\n\tMikrotik: Failed to set subnet ${MAAS_SUB_NET_1} to vlan1";exit 1; }
+    [[ ${IP_2_VLAN_OK} = ${FALSE} ]] && { echo -e "\n\tMikrotik: Failed to set subnet ${MAAS_SUB_NET_2} to vlan1";exit 1; }
+    printf "\n\tMikrotik: Successfully configured Mikrotek router @ ${OB_ROUTER} for Single Network Mode!\n\n"
+
+elif [[ $DUALNETWORK -eq 1 ]];then
+
+
+    ssh -o "StrictHostKeyChecking no" admin@${OB_ROUTER} /interface ethernet set master-port=ether1-master-local 4,6,8,10,12,14,16,18,20,22
+    [[ $? -eq 0 ]] && ETHER_1_OK=${TRUE} || ETHER_1_OK=${FALSE}
+
+    ssh -o "StrictHostKeyChecking no" admin@${OB_ROUTER} /interface ethernet set master-port=ether2-master-local 5,7,9,11,13,15,17,19,21,23
+    [[ $? -eq 0 ]] && ETHER_2_OK=${TRUE} || ETHER_2_OK=${FALSE}
+    
+    ssh -o "StrictHostKeyChecking no" admin@${OB_ROUTER} /ip address set ${MTEK_IP_ID_1} interface=vlan1
+    [[ $? -eq 0 ]] && IP_1_VLAN_OK=${TRUE} || IP_1_VLAN_OK=${FALSE}
+
+    ssh -o "StrictHostKeyChecking no" admin@${OB_ROUTER} /ip address set ${MTEK_IP_ID_2} interface=vlan2
+    [[ $? -eq 0 ]] && IP_2_VLAN_OK=${TRUE} || IP_2_VLAN_OK=${FALSE}
+
+    [[ ${ETHER_1_OK} = ${FALSE} ]] && { echo -e "\n\tMikrotik: Failed to set master port to ether1-master-local for ports: "${ETH1_PORTS};exit 1; }
+    [[ ${ETHER_2_OK} = ${FALSE} ]] && { echo -e "\n\tMikrotik: Failed to set master port to ether2-master-local for ports: "${ETH2_PORTS};exit 1; }
+    [[ ${ETHER_1_OK} = ${TRUE} ]] && { echo -e "\n\tMikrotik: Successfully set master port to ether1-master-local for ports: "${ETH1_PORTS}; }
+    [[ ${ETHER_2_OK} = ${TRUE} ]] && { echo -e "\n\tMikrotik: Successfully set master port to ether2-master-local for ports: "${ETH2_PORTS}; }
+    [[ ${IP_1_VLAN_OK} = ${TRUE} ]] && { echo -e "\n\tMikrotik: Successfully set subnet ${MAAS_SUB_NET_1} to vlan1"; }
+    [[ ${IP_2_VLAN_OK} = ${TRUE} ]] && { echo -e "\n\tMikrotik: Successfully set subnet ${MAAS_SUB_NET_2} to vlan2"; }
+    [[ ${IP_1_VLAN_OK} = ${FALSE} ]] && { echo -e "\n\tMikrotik: Failed to set subnet ${MAAS_SUB_NET_1} to vlan1";exit 1; }
+    [[ ${IP_2_VLAN_OK} = ${FALSE} ]] && { echo -e "\n\tMikrotik: Failed to set subnet ${MAAS_SUB_NET_2} to vlan2";exit 1; }
+    printf "\n\tMikrotik: Successfully configured Mikrotek router @ ${OB_ROUTER} for Dual Network Mode!\n\n"
+    
+fi
+
+
+
+eval $(maas admin subnets read |jq -r '.[]|select(.cidr=="'${MAAS_SUB_NET_1}'")|.vlan|"MAAS_VLAN_ID_1="+(.id|tostring),"MAAS_FABRIC_ID_1="+(.fabric_id|tostring)')
+[[ -z ${MAAS_FABRIC_ID_1} ]] && { echo "Failed to fetch fabric id 1 from maas server @ ${MAAS_URL}";exit 1; }
+[[ -z ${MAAS_VLAN_ID_1} ]] && { echo "Failed to fetch vlan id 1 from maas server @ ${MAAS_URL}";exit 1; }
+
+eval $(maas admin subnets read |jq -r '.[]|select(.cidr=="'${MAAS_SUB_NET_2}'")|.vlan|"MAAS_VLAN_ID_2="+(.id|tostring),"MAAS_FABRIC_ID_2="+(.fabric_id|tostring)')
+[[ -z ${MAAS_FABRIC_ID_2} ]] && { echo "Failed to fetch fabric id 2 from maas server @ ${MAAS_URL}";exit 1; }
+[[ -z ${MAAS_VLAN_ID_2} ]] && { echo "Failed to fetch vlan id 2 from maas server @ ${MAAS_URL}";exit 1; }
+
+for node in {01..10};do
+    MAAS_NODE_NAME="node${node}ob${OB_NUM}"
+    eval $(echo $MAAS_MACHINE_STATES |jq -r '.[]|select(.hostname=="'${MAAS_NODE_NAME}'")|"MAAS_SYSID="+.system_id,"MAAS_STATUS="+.status_name')
+    maas admin interface update ${MAAS_SYSID} eth0 vlan=${MAAS_VLAN_ID_1} subnet=${MAAS_SUB_NET_1} mode=auto>> ${OB_LOG} 2>&1
+    if [[ $? -eq 0 ]];then
+        printf "\tMAAS: Successfully set  eth0 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to use vlan ${MAAS_VLAN_ID_1}\n"
+    else
+        printf "\tMAAS: Failed to set  eth0 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to vlan ${MAAS_VLAN_ID_1} (${MAAS_SUB_NET_1})\n\n"
+        [[ ${FORCE} -eq 0 ]] && exit 2
+    fi
+    
+    if [[ $SINGLENETWORK -eq 1 ]];then
+        maas admin interface update ${MAAS_SYSID} eth1 vlan=${MAAS_VLAN_ID_1} >> ${OB_LOG} 2>&1
+        if [[ $? -eq 0 ]];then
+            printf "\tMAAS: Successfully set  eth1 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to use vlan ${MAAS_VLAN_ID_1}\n"
+        else
+            printf "\tMAAS: Failed to set  eth1 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to vlan ${MAAS_VLAN_ID_1} (${MAAS_SUB_NET_1})\n\n"
+            [[ ${FORCE} -eq 0 ]] && exit 2
+        fi
+    elif [[ $DUALNETWORK -eq 1 ]];then
+        maas admin interface update ${MAAS_SYSID} eth1 vlan=${MAAS_VLAN_ID_2} >> ${OB_LOG} 2>&1
+        if [[ $? -eq 0 ]];then
+            printf "\tMAAS: Successfully set  eth1 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to use vlan ${MAAS_VLAN_ID_2}\n"
+        else
+            printf "\tMAAS: Failed to set  eth1 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to vlan ${MAAS_VLAN_ID_2} (${MAAS_SUB_NET_2})\n\n"
+            [[ ${FORCE} -eq 0 ]] && exit 2
+        fi
+    fi    
+done    
+    #update machine states
+    MAAS_MACHINE_STATES=$(maas admin machines read)
+for node in {01..10};do
+    MAAS_NODE_NAME="node${node}ob${OB_NUM}"
+    eval $(echo $MAAS_MACHINE_STATES |jq -r '.[]|select(.hostname=="'${MAAS_NODE_NAME}'")|"MAAS_SYSID="+.system_id,"MAAS_STATUS="+.status_name')
+    if  [[ -z $(echo $MAAS_MACHINE_STATES|jq -r '.[]|select(.system_id=="'${MAAS_SYSID}'")|.interface_set[]|select(.name=="eth0")|.links[]') ]];then
+        if [[ ${MAAS_STATUS} = Ready || ${MAAS_STATUS} = Broken ]];then
+            maas admin interface link-subnet ${MAAS_SYSID} eth0 mode=auto subnet="${MAAS_SUB_NET_1}" >> ${OB_LOG} 2>&1
+            if [[ $? -eq 0 ]];then
+                printf "\tMAAS: Successfully linked  eth0 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to subnet ${MAAS_SUB_NET_1}\n"
+            else
+                printf "\t\tMAAS: Failed to link  eth0 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to subnet ${MAAS_SUB_NET_1}\n\n"
+                [[ ${FORCE} -eq 0 ]] && exit 2
+            fi
+        else
+            export PARTIAL=1
+            printf "\tMAAS: Cannot link  eth0 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to subnet ${MAAS_SUB_NET_1} because node is in a ${MAAS_STATUS} state\n"
+            printf "\n"
+
+        fi
+    fi
+
+    
+    if [[ $SINGLENETWORK -eq 1 ]] && [[ -z $(echo $MAAS_MACHINE_STATES|jq -r '.[]|select(.system_id=="'${MAAS_SYSID}'")|.interface_set[]|select(.name=="eth1")|.links[]') ]];then
+        if [[ ${MAAS_STATUS} = Ready || ${MAAS_STATUS} = Broken ]];then
+            maas admin interface link-subnet ${MAAS_SYSID} eth1 mode=auto subnet="${MAAS_SUB_NET_1}" >> ${OB_LOG} 2>&1
+            if [[ $? -eq 0 ]];then
+                printf "\tMAAS: Successfully linked  eth1 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to subnet ${MAAS_SUB_NET_1}\n"
+            else
+                printf "\t\tMAAS: Failed to link  eth1 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to subnet ${MAAS_SUB_NET_1}\n\n"
+                [[ ${FORCE} -eq 0 ]] && exit 2
+            fi
+        else
+            export PARTIAL=1
+            printf "\tMAAS: Cannot link  eth1 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to subnet ${MAAS_SUB_NET_1} because node is in a ${MAAS_STATUS} state\n"
+            printf "\n"
+    
+        fi
+    elif [[ $DUALNETWORK -eq 1 ]] &&  [[ -z $(echo $MAAS_MACHINE_STATES|jq -r '.[]|select(.system_id=="'${MAAS_SYSID}'")|.interface_set[]|select(.name=="eth1")|.links[]') ]];then
+        if [[ ${MAAS_STATUS} = Ready || ${MAAS_STATUS} = Broken ]];then
+            maas admin interface link-subnet ${MAAS_SYSID} eth1 mode=auto subnet="${MAAS_SUB_NET_2}" >> ${OB_LOG} 2>&1
+            if [[ $? -eq 0 ]];then
+                printf "\tMAAS: Successfully linked  eth1 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to subnet ${MAAS_SUB_NET_2}\n"
+            else
+                printf "\t\tMAAS: Failed to link  eth1 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to subnet ${MAAS_SUB_NET_2}\n\n"
+                [[ ${FORCE} -eq 0 ]] && exit 2
+            fi
+        else
+            export PARTIAL=1
+            printf "\tMAAS: Cannot link  eth1 on ${MAAS_NODE_NAME} (${MAAS_SYSID}) to subnet ${MAAS_SUB_NET_2} because node is in a ${MAAS_STATUS} state\n"
+        fi
+    fi
+         
+done
+[[ $SINGLENETWORK -eq 1 && PARTIAL -eq 0 ]] && printf "\n Successfully configured OrangeBox${OB_NUM} for Single Network Mode!\n\n"
+[[ $DUALNETWORK -eq 1 && PARTIAL -eq 0 ]] && printf "\n Successfully configured OrangeBox${OB_NUM} for Dual Network Mode!\n\n"
+[[ $SINGLENETWORK -eq 1 && PARTIAL -eq 1 ]] && printf "\nPartially configured OrangeBox${OB_NUM} for Single Network Mode.\n\n"
+[[ $DUALNETWORK -eq 1 && PARTIAL -eq 1 ]] && printf "\nPartially configured OrangeBox${OB_NUM} for Dual Network Mode.\n\n"
+
+
+unset PLUS1 PLUS2 PLUS3 BYTE1 BYTE2 MAAS_SYSID MAAS_FABRIC_ID_1 MAAS_VLAN_ID_1 MAAS_SUB_NET_1 MAAS_FABRIC_ID_2 MAAS_VLAN_ID_2 MAAS_SUB_NET_2 MAAS_NODE_NAME MAAS_STATUS ETHER_1_OK ETHER_2_OK ETH1_PORTS ETH2_PORTS FORCE SINGLENETWORK DUALNETWORK PARTIAL MAAS_MACHINE_STATES OB_ROUTER
+
+
+