Merge lp:~cpe-sa/obinstall/profile into lp:obinstall/next

[Matt Jarvis]

[Michael Iatrou (michael.iatrou)]

Tested during ODS.

review: Approve

Unmerged revisions

20. By Matt Jarvis <email address hidden> on 2017-04-25

Refactor - add profile, functions, update LP_USERS, add installer script

=== removed file '00-network.sh'
--- 00-network.sh	2016-09-20 09:23:07 +0000
+++ 00-network.sh	1970-01-01 00:00:00 +0000
@@ -1,187 +0,0 @@
-#!/bin/bash
-#
-#    Setup of OrangeBox network
-#    Copyright (C) 2014 Canonical Ltd.
-#
-#    Authors: Dustin Kirkland <[e-mail]>
-#             Scott Croft <[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
-#    the Free Software Foundation, version 3 of the License.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#    
-set -e
-set -x
-
-# If user is not root then exit
-#
-if [ "$(id -u)" != "0" ]; then
-  echo "Must be run with sudo or by root"
-  exit 77
-fi
-
-#Get Orangebox number from the hostname and place into the configuration file
-obnum=`hostname | cut -c 10- -`
-echo "orangebox_number=${obnum}" > /etc/orange-box.conf
-
-# Install bridge-utils first
-apt-get update
-apt-get install -y bridge-utils
-
-# Get interface names of the 3 interfaces on node0 since in Xenial they aren't ethX anymore
-# An array is declared and the interface names are placed into the array to be used later on
-#
-declare interface=()
-
-for inter_face in $(ip a | awk '{print $2}'|egrep 'enp|enx'|sed 's/://')
-do
-   echo "Interface read $inter_face"
-   interface=("${interface[@]}" "$inter_face")
-done
-echo "Interfaces assigned "${interface[@]}""
-
-# Check to make sure the OrangeBox is divisable by 4 to ensure the network is setup correctly
-#
-check_orangebox_number() {
-	local num=$1
-	if [[ $((num/4)) -lt 1 ]]; then
-		echo "Your hostname should in the format of OrangeBox??: ex OrangeBox56"
-		exit 1;
-	fi
-}
-
-#Add kernel parameters for networking with MAAS to function correctly
-#
-echo "net.ipv4.ip_forward=1" >> /etc/sysctl.conf
-echo "net.ipv4.conf.all.accept_redirects = 1" >> /etc/sysctl.conf
-
-# Assign variables with the values for the network setup and execute the check_orangebox_number
-#
-. /etc/orange-box.conf
-
-check_orangebox_number ${obnum}
-internal1_ip="172.27.$((orangebox_number)).1"
-gateway1_ip=172.27.$((orangebox_number+1)).254
-internal2_ip=172.27.$((orangebox_number+2)).1
-gateway2_ip=172.27.$((orangebox_number+3)).254
-gateway_ip=$gateway1_ip
-
-# Set up the nic variables
-internal0_if="${interface[0]}"
-internal1_if="${interface[1]}"
-internal2_if="${interface[2]}"
-
-# check with i/f is on which bridge-vlan
-ifconfig ${internal1_if} ${internal1_ip}/23
-ping -c 1 ${gateway1_ip}
-if [[ $(echo $?) -eq 0 ]]
-then
-	ip addr flush dev ${internal1_if}
-	internal1_if="${interface[1]}"
-	internal2_if="${interface[2]}"
-else
-	ip addr flush dev ${internal1_if}
-        internal1_if="${interface[2]}"
-        internal2_if="${interface[1]}"
-fi
-
-# Setup the network interfaces for Node0 and populate the /etc/network/networking file with the correct
-# information
-#
-setup_networking() {
-	# Disable NetworkManager 
-	systemctl stop NetworkManager
-	systemctl disable NetworkManager
-		
-	# gen network configuration /etc/network/interfaces
-        cat >/etc/network/interfaces <<-EOF
-	#These are generated by orange-box build scripts
-	auto lo
-	iface lo inet loopback
-
-	auto $internal0_if
-	iface $internal0_if inet manual
-
-	auto $internal1_if
-	iface $internal1_if inet manual
-
-	auto $internal2_if
-	iface $internal2_if inet manual
-
-	auto br0
-	iface br0 inet static
-	    address ${internal1_ip}
-	    netmask 255.255.254.0
-	    gateway ${gateway_ip}
-	    dns-nameservers ${internal1_ip} ${gateway_ip}
-	    bridge_ports $internal1_if
-	    bridge_stp off
-	    bridge_fd 0
-	    bridge_maxwait 0
-
-	auto br1
-	iface br1 inet static
-	    address ${internal2_ip}
-	    netmask 255.255.254.0
-	    bridge_ports $internal2_if
-	    bridge_stp off
-	    bridge_fd 0
-	    bridge_maxwait 0
-EOF
-
-        # Take down all of the interfaces
-        ifdown --force $internal0_if || true
-	ifdown --force $internal1_if || true
-	ifdown --force $internal2_if || true
-
-	# Take down br interfaces
-	ifdown --force br0 || true
-	ifdown --force br1 || true
-
-	# Bring up br0, br1
-	ifup $internal1_if --force
-	ifup $internal2_if --force
-	ifup br0 --force
-        ifup br1 --force
-
-        # Wait a moment for the network to normalize
-	echo "INFO: Ensure networking has settled"
-        if ping -c 3 8.8.8.8
-        then
-             echo ""
-             echo "Networking is fine"
-             echo ""
-        else
-             echo ""
-             echo "You're having network issues, fix them"
-             echo ""
-             exit 1
-        fi
-
-        # Confirm DNS working
-        echo "INFO: Ensure DNS working"
-        if ping -c 3 google.com
-        then
-             echo ""
-             echo "DNS is fine"
-             echo ""
-        else
-             echo ""
-             echo "DNS is having issues, check /etc/resolv.conf and ifdown/ifup br0/br1 interfaces if need be"
-             echo ""
-             exit 2
-        fi
-}
-
-setup_networking
-
-exit 0

=== removed file '01-packages.sh'
--- 01-packages.sh	2016-06-13 13:52:57 +0000
+++ 01-packages.sh	1970-01-01 00:00:00 +0000
@@ -1,165 +0,0 @@
-#!/bin/bash
-#
-#    Installation of all the required packages to configure the OrangeBox
-#    Copyright (C) 2016 Canonical Ltd.
-#
-#    Authors: Scott Croft <[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
-#    the Free Software Foundation, version 3 of the License.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-set -e
-set -x
-
-
-# If user is not root then exit
-if [ "$(id -u)" != "0" ]; then
-  echo "Must be run with sudo or by root"
-  exit 77
-fi
-
-# Check to ensure that the user on the system is ubuntu and assigned the uid of 1000
-#
-if [ "$(id -u ubuntu)" != "1000" ]; then
- echo "ERROR: Read the docs; a proper OrangeBox setup requires the default user to be [ubuntu]" 1>&2
- exit 1
-fi
-
-# The usage script will deliver a message on what should be executed to install the correct software
-#
-
-usage()
-{
-cat << EOF
-usage: $0 options
-
-This script to select desired repository and install packages 
-
-OPTIONS:
-   -h      Show this message
-   -p      Manually enter in ppa's name (as in ppa:/juju/stable)
-EOF
-}
-
-get_orangebox_number() {
-obnum=`hostname | cut -c 10- -`
-echo $obnum
-echo "orangebox_number=$obnum" > /etc/orange-box.conf
-}
-
-# Setup the ssh keys for the Ubuntu user on the OrangeBox
-#
-setup_ssh_keys() {
-        # Disable remote password authentication, since our username/password
-        # combo is very well known
-        if ! grep -qs "^PasswordAuthentication no" /etc/ssh/sshd_config 2>/dev/null; then
-                echo "PasswordAuthentication no" >> /etc/ssh/sshd_config
-                invoke-rc.d ssh stop || true
-                invoke-rc.d ssh start
-        fi
-        if [ ! -e /home/ubuntu/.ssh/id_rsa ]; then
-                su -l ubuntu -c "ssh-keygen -N '' -f /home/ubuntu/.ssh/id_rsa"
-        fi
-
-        install -o ubuntu -g ubuntu -m 0600 template/ssh_config ~ubuntu/.ssh/config
-}
-
-# Install the extra packages needed for the desktop and configuration of the OrangeBox
-#
-install_packages (){
-    packages=
-    while read package; do
-        package=${package%%#*}
-        packages="$packages $package"
-    done < PACKAGES.list
-    apt install -y $packages
-}
-
-# Setup the ppa's for what respositories will be used to install the correct packages with respect to MAAS and Juju
-#
-set_up_ppas(){
-if [ "$1" = "default" ];then
-  printf "Adding Stable ppa's"
-  printf "\n"
-  add-apt-repository -y ppa:juju/stable
-  add-apt-repository -y ppa:maas/stable
-fi
-if [ "$1" = "jujuexp" ];then
-  printf "Adding juju experimental ppa"
-  printf "\n"
-  add-apt-repository -y ppa:juju/proposed
-fi
-if [ "$1" = "maasexp" ];then
-  printf "Adding maas experimental ppa"
-  printf "\n"
-  add-apt-repository -y ppa:maas/proposed
-fi
-if [ "$1" = "ppaset" ];then
-  printf "Build system with custom PPAS"
-  printf "\n"
-  printf "Enter ppa for juju (i.e. ppa:juju/stable):"
-    read JUJUPPA
-  printf "Enter ppa for maas (i.e. ppa:maas-maintainers/stable):"
-    read MAASPPA
-    add-apt-repository -y $JUJUPPA 
-    add-apt-repository -y $MAASPPA 
-fi
-
-# Replace whatever locale was used with nothing so the system just goes to
-# archive.ubuntu.com
-#
-
-sed -i.orig 's|http://.*archive|http://archive|g' /etc/apt/sources.list
-
-# Update the system sources and packages, then install new packages required for
-# the OrangeBox
-#
-
-apt-get update -y
-apt-get dist-upgrade -y
-apt-get install run-one -y
-install_packages
-setup_ssh_keys
-sleep 5
-reboot
-}
-
-if (($# == 0)); then
-  set_up_ppas default
-fi
-
-# Section to decide which options to use
-#
-while getopts “hp” OPTION
-do
-     case $OPTION in
-         h)
-             usage
-             exit 1
-             ;;
-         p)
-             set_up_ppas ppaset 
-             ;;
-         v)
-             VERBOSE=1
-             ;;
-         ?)
-             usage
-             exit
-             ;;
-        \?)
-             echo "Invalid option: -$OPTARG" >&2
-             ;;
-     esac
-done
-

=== removed file '02-apache_setup.sh'
--- 02-apache_setup.sh	2016-06-02 16:26:55 +0000
+++ 02-apache_setup.sh	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-#/bin/bash
-#
-#    Setup of OrangeBox network
-#    Copyright (C) 2014 Canonical Ltd.
-#
-#    Authors:  Scott Croft <[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
-#    the Free Software Foundation, version 3 of the License.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-# script to configure apache
-#
-set -e
-set -x
-
-
-# If user is not root then exit
-#
-if [ "$(id -u)" != "0" ]; then
-  echo "Must be run with sudo or by root"
-  exit 77
-fi
-
-# This sets up Apache so that when going to the OB IP address of Node0, the user is automatically put
-# into the MAAS login/interface and they don't have to place /MAAS at the end of the system-name or IP address
-#
-setup_apache() {
-        mkdir -p /srv/mirrors/archive.ubuntu.com
-        echo '<meta http-equiv="refresh" content="0; url=MAAS/">' > /srv/mirrors/archive.ubuntu.com/index.html
-        invoke-rc.d apache2 stop || true
-        invoke-rc.d apache2 start
-}
-
-setup_apache

=== removed file '03-maas_setup_environment.sh'
--- 03-maas_setup_environment.sh	2016-09-20 09:23:07 +0000
+++ 03-maas_setup_environment.sh	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-#!/bin/bash
-#
-#    Setup of OrangeBox MAAS environment
-#    Copyright (C) 2016 Canonical Ltd.
-#
-#    Authors: Scott Croft <[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
-#    the Free Software Foundation, version 3 of the License.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-set -ax
-# If user is not root then exit
-if [ "$(id -u)" != "0" ]; then
-  echo "Must be run with sudo or by root"
-  exit 77
-fi
-
-#Get ob number
-ob_number=`hostname | cut -c 10- -`
-
-# Set the MAAS URL and CLUSTER_UUID for the admin login setup
-MAAS_URL=http://172.27.${ob_number}.1/MAAS
-CLUSTER_UUID=`grep cluster_uuid /etc/maas/rackd.conf |awk '{print $2}'`
-
-#AMT Password set
-AMT_PASSWORD=Password1+
-
-#Set ip's for MAAS configuration
-router_ip=172.27.`expr ${ob_number} + 1`.254
-dhcp_low=172.27.`expr ${ob_number} + 1`.1
-dhcp_high=172.27.`expr ${ob_number} + 1`.20
-dns_ip=172.27.`expr ${ob_number} + 1`.254
-sub_net="172.27.${ob_number}.0/23"
-gateway_ip="172.27.${ob_number}.1"
-dns_servers="172.27.${ob_number}.1"
-
-#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
-fi
-
-#get apikey variable
-apikey=`maas-region apikey --username admin | tail -n1`
-
-#login to MAAS
-maas login admin $MAAS_URL $apikey
-
-#Add ssh key to MAAS
-maas admin sshkeys create key="$(cat /home/ubuntu/.ssh/id_rsa.pub)" || true
-
-#update VLAN info to switch on DHCP
-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
-done
-maas admin subnet update ${sub_net} gateway_ip=${gateway_ip} dns_servers=${dns_servers}
-
-#update http conf
-cat >/var/www/html/index.html <<EOF
-<meta http-equiv="refresh" content="0; url=/MAAS">
-EOF
-
-#update DNS info
-maas admin maas set-config name=upstream_dns value=$dns_ip
-maas admin maas set-config name=dnssec_validation value=no
-maas admin maas set-config name=kernel_opts value="net.ifnames=0"
-sed -e 's/dnssec-validation  auto;/dnssec-enable no;dnssec-validation no;/g' -i /etc/bind/named.conf.options
-pkill -HUP named
-
-#Import boot images
-maas admin boot-source-selections create 1 os="ubuntu" release="xenial" arches="amd64" subarches="*" labels="*" || true
-maas admin boot-source-selections create 1 os="ubuntu" release="trusty" arches="amd64" subarches="*" labels="*" || true
-maas admin boot-resources import
-while [ $(maas admin boot-resources read name=$CLUSTER_UUID | wc -l) -lt 10 ]; do
-echo " Waiting for images to download"
-   sleep 10
-done
-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"

=== removed file '04-add_virtual_nodes.sh'
--- 04-add_virtual_nodes.sh	2016-09-20 09:23:07 +0000
+++ 04-add_virtual_nodes.sh	1970-01-01 00:00:00 +0000
@@ -1,135 +0,0 @@
-#!/bin/bash
-#
-#    orange-box-setup-kvms - create some virtual machines
-#    Copyright (C) 2014 Canonical Ltd.
-#
-#    Authors: Ronald McCollam <[e-mail]>
-#             Dustin Kirkland <[e-mail]>
-#    Modified: Scott Croft <[e-mail]> 2016
-#
-#    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
-#    the Free Software Foundation, version 3 of the License.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-trap 'echo Error at about $LINENO' ERR
-
-# Source file to get OB number variable
-. /etc/orange-box.conf
-
-# Set network variables
-external_ip="172.27.252.${orangebox_number}"
-internal_ip="172.27.${orangebox_number}.1"
-internal_network="172.27.${orangebox_number}.0"
-
-# If user is not root then exit
-if [ "$(id -u)" != "0" ]; then
-  echo "Must be run with sudo or by root"
-  exit 77
-fi
-
-set -e
-set -aux
-
-virsh net-info default && virsh net-destroy default && virsh net-undefine default
-
-# If directory exist then change ownership
-[ -d /var/lib/maas ] || install -d /var/lib/maas --owner maas --group maas
-
-# Create the /srv/obvms directory for storing the virtual machines files
-[ -d /srv/obvms ] || mkdir /srv/obvms
-chown libvirt-qemu:kvm /srv/obvms
-touch /srv/obvms/junk.img
-rm /srv/obvms/*.img
-
-# Change login shell to Bash for MAAS user
-chsh maas -s /bin/bash
-
-# If directory exist then make directory and change ownership
-[ -d /var/lib/maas/.ssh ] || mkdir /var/lib/maas/.ssh && chown maas:maas /var/lib/maas/.ssh
-
-# If file exist then echo 3 returns but do not output trailing newlines. Create SSH key for MAAS user with no passphrase of type RSA v2 at the specified location
-[ -f /var/lib/maas/.ssh/id_rsa ] || echo -e "\n\n\n" | sudo -u maas ssh-keygen -N "" -t rsa -f /var/lib/maas/.ssh/id_rsa
-
-# If file exist then gather known host keys of MAAS user for OB and append to the end of specified file while discarding output
-[ -f /var/lib/maas/.ssh/known_hosts ] || sudo -u maas ssh-keyscan 172.27.${orangebox_number}.1 |sudo -u maas tee -a /var/lib/maas/.ssh/known_hosts > /dev/null
-
-# Always add host keys .. not an issue if files grows
-sudo -u maas ssh-keyscan 172.27.${orangebox_number}.1 |sudo -u maas  tee -a /var/lib/maas/.ssh/known_hosts > /dev/null
-
-# if very first install ubuntu user might not have authorized keys set.
-if [ ! -f /home/ubuntu/.ssh/authorized_keys ]; then
-    mkdir -p /home/ubuntu/.ssh/
-    cat /var/lib/maas/.ssh/id_rsa.pub | tee -a /home/ubuntu/.ssh/authorized_keys
-    chown -R ubuntu /home/ubuntu/.ssh/
-    chmod 700  /home/ubuntu/.ssh/
-fi
-
-sudo -u maas virsh -c qemu+ssh://ubuntu@172.27.${orangebox_number}.1/system list > /dev/null || sed -i '/ maas@/d' /home/ubuntu/.ssh/authorized_keys
-
-# If there is no key /new install or just removed add it"
-# echo -e "\n\n\n" | sudo -u maas ssh-keygen -N "" -t rsa -f /var/lib/maas/.ssh/id_rsa
-grep 'maas@' /home/ubuntu/.ssh/authorized_keys || cat /var/lib/maas/.ssh/id_rsa.pub | tee -a /home/ubuntu/.ssh/authorized_keys
-printf "%s,%s %s %s\n" "node0.maas" "$internal_ip" $(awk '{print $1 " " $2}' /etc/ssh/ssh_host_ecdsa_key.pub) | tee -a /var/lib/maas/.ssh/known_hosts
-
-#Change ownership of specified directory
-chown -R ubuntu:ubuntu /home/ubuntu
-
-# Add virtual node tags in MAAS
-maas admin tags create name=virtual || true
-maas admin tags create name=bootstrap || true
-maas admin tags create name=neutron || true
-
-# Mark all nodes to be fast path installed
-# Support MAAS 1.5, and 1.6
-maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
-if dpkg --compare-versions $maas_ver lt 1.6; then
-	maas admin tags create name='use-fastpath-installer' comment='fp' "definition=true()" || true
-else
-	maas admin tags create name='use-fastpath-installer' comment='fp' || true
-fi
-
-#Create zone0 for virtual nodes
-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"
-	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
-        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
-        fi
-	virsh console $hostname || true
-	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)
-
-	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)
-				maas admin tag update-nodes "bootstrap" add=$system_id
-			;;
-			1)
-				maas admin tag update-nodes "neutron" add=$system_id
-			;;
-		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

=== removed file '04a-mod_virtual_nodes.sh'
--- 04a-mod_virtual_nodes.sh	2016-09-20 09:23:07 +0000
+++ 04a-mod_virtual_nodes.sh	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-#!/bin/bash
-#
-#    Script to modify virtual OrangeBox nodes in MAAS
-#    Copyright (C) 2016 Canonical Ltd.
-#
-#    Authors: Scott Croft <[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
-#    the Free Software Foundation, version 3 of the License.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-set -aux
-
-# Source file to get OB number variable
-. /etc/orange-box.conf
-
-# If user is not root then exit
-if [ "$(id -u)" != "0" ]; then
-  echo "Must be run with sudo or by root"
-  exit 77
-fi
-
-# Ensure the MAAS URL is set correctly
-MAAS_URL=http://172.27.${orangebox_number}.1/MAAS
-
-# set apikey variable
-apikey=`maas-region apikey --username admin | tail -n1`
-
-# login to MAAS
-maas login admin $MAAS_URL $apikey
-
-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)
-        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
-	do
-		maas admin subnet read $subnet_id|grep "\"cidr\": \"${sub_net}\"" 1>/dev/null
-		if [[ $? -eq 0 && ${eth1_set} -eq 1 ]]
-		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}')
-			maas admin interface update $system_id eth1 vlan=$vlanid
-			maas admin interface link-subnet $system_id eth1 mode=auto subnet="$sub_net"
-		fi
-	done
-done

=== removed file '05-add_physical_nodes.sh'
--- 05-add_physical_nodes.sh	2016-12-07 17:37:21 +0000
+++ 05-add_physical_nodes.sh	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-#!/bin/bash
-#
-#    Script to add physical OrangeBox nodes to MAAS
-#    Copyright (C) 2016 Canonical Ltd.
-#
-#    Authors: Scott Croft <[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
-#    the Free Software Foundation, version 3 of the License.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-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
-
-# Get ob number
-#
-ob_number=`hostname | cut -c 10- -`
-
-# 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}'`
-
-# AMT Password set
-AMT_PASSWORD=Password1+
-
-# set apikey variable
-apikey=`maas-region apikey --username admin | tail -n1`
-
-# login to MAAS
-maas login admin $MAAS_URL $apikey
-
-# 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
-
-done

=== removed file '05a-mod_physical_nodes.sh'
--- 05a-mod_physical_nodes.sh	2016-09-20 09:23:07 +0000
+++ 05a-mod_physical_nodes.sh	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-#!/bin/bash
-#
-#    Script to add physical OrangeBox nodes to MAAS
-#    Copyright (C) 2016 Canonical Ltd.
-#
-#    Authors: Scott Croft <[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
-#    the Free Software Foundation, version 3 of the License.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-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
-
-# Get ob number
-#
-ob_number=`hostname | cut -c 10- -`
-
-# Ensure the MAAS URL is set correctly
-#
-MAAS_URL=http://172.27.${ob_number}.1/MAAS
-
-# set apikey variable
-#
-apikey=`maas-region apikey --username admin | tail -n1`
-
-# login to MAAS
-#
-maas login admin $MAAS_URL $apikey
-
-# Configure second usb interface for second fabric and proper subnet
-#
-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
-done

=== removed file '06-juju_environment.sh'
--- 06-juju_environment.sh	2016-09-20 09:23:07 +0000
+++ 06-juju_environment.sh	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-#Get ob number
-ob_number=`hostname | cut -c 10- -`
-
-router_ip=172.27.${ob_number}.1
-#set apikey variable
-apikey=`sudo maas-region apikey --username admin | tail -n1`
-
-setup_juju() {
-        mkdir -p /home/ubuntu/.juju
-        cat >/home/ubuntu/.juju/environments.yaml <<EOF
-default: maas
-environments:
-    maas:
-        type: maas
-        maas-server: 'http://${router_ip}/MAAS/'
-        maas-oauth: '$apikey'
-        default-series: trusty
-        #enable-os-upgrade: false
-        authorized-keys-path: /home/ubuntu/.ssh/id_rsa.pub
-        admin-secret: 'admin'
-        logging-config: '<root>=DEBUG'
-        lxc-clone: true
-EOF
-        rm -rf /home/ubuntu/.juju-plugins
-        git clone https://github.com/juju/plugins /home/ubuntu/.juju-plugins
-
-        # Change ownership recusrively of specified directory
-#        sudo chown -R ubuntu:ubuntu /home/ubuntu/
-
-        echo "PATH=\$PATH:/home/ubuntu/.juju-plugins:/home/ubuntu/Examples/bin" >> /home/ubuntu/.bashrc
-        echo "export JUJU_DEV_FEATURE_FLAGS=maas2" >> /home/ubuntu/.bashrc
-}
-
-setup_landscape() {
-        # The master node will be managed by Landscape
-        if which landscape-config; then
-                case "$(hostname)" in
-                        OrangeBox*|orangebox*)
-                                sudo landscape-config -a cpe-sa -t "$(hostname)__$(dmidecode -s baseboard-serial-number)" --script-users=ALL --silent --include-manager-plugins=ScriptExecution || true
-                        ;;
-                esac
-        fi
-}
-
-setup_desktop() {
-        # connect running session bus if any
-        dbus_session_bus_address=$(pgrep -u "$USER" -af 'dbus-daemon --fork --session' | grep -o 'unix:.*' || true)
-        if [ -n "$dbus_session_bus_address" ]; then
-            env DBUS_SESSION_BUS_ADDRESS="$dbus_session_bus_address" \
-                dconf load / < template/dconf.txt
-        else
-            dbus-launch dconf load / < template/dconf.txt
-        fi
-
-        # Disable Ubuntu crash reporter
-        echo "enabled=0" |sudo tee /etc/default/apport
-
-        # Stop Ubuntu crash reporter
-        sudo invoke-rc.d apport stop || true
-}
-
-setup_remmina() {
-        if [[ -d /home/ubuntu/.remmina ]]
-	then
-		echo "Remmina already setup"
-	else
-		echo "Setting up Remmina..."
-		mkdir /home/ubuntu/.remmina
-        	for nodenum in {1..10}
-        	do
-             		cat >/home/ubuntu/.remmina/node${nodenum}.remmina <<EOF
-[remmina]
-keymap=
-ssh_auth=0
-quality=0
-disableencryption=0
-ssh_charset=
-ssh_privatekey=
-server=172.27.${ob_number}.`expr ${nodenum} + 10`
-hscale=0
-group=
-password=Ubuntu1+
-name=node${nodenum}
-ssh_loopback=0
-viewonly=0
-ssh_username=
-ssh_server=
-window_maximize=0
-aspectscale=0
-protocol=VNC
-window_height=825
-window_width=963
-vscale=0
-ssh_enabled=0
-username=admin
-showcursor=0
-disableserverinput=0
-colordepth=8
-disableclipboard=0
-viewmode=1             
-EOF
-		done
-		chown -R ubuntu:ubuntu /home/ubuntu/.remmina
-	fi
-}
-
-setup_juju
-setup_landscape
-setup_desktop
-setup_remmina
-/srv/obinstall/import_SA_keys.sh
-if [[ -d /srv/sademos-15.10 ]]
-then
-	cd /srv/sademos-15.10; bzr pull
-else
-	bzr branch lp:sademos /srv/sademos-15.10
-fi
-if [[ -d /srv/sademos-16.04 ]]
-then
-	cd /srv/sademos-16.04; bzr pull
-else
-	bzr branch lp:sademos/16.04 /srv/sademos-16.04
-fi
-ln -s /srv/sademos-16.04 /home/ubuntu/sademos-juju2
-ln -s /srv/sademos-15.10 /home/ubuntu/sademos-juju1.25

=== modified file 'LP_USERS.list'
--- LP_USERS.list	2017-01-24 22:18:42 +0000
+++ LP_USERS.list	2017-04-25 19:02:06 +0000
@@ -4,26 +4,24 @@
 sabdfl
 
 # Americas
-mahmoh
-secroft
 elchito
 michael.iatrou
-achandrashekar
-jfrancisco-poo
-fenar-e
 craig-bender
-twitch0815
 mcjilton
+<<<<<<< TREE
 boulderrickv
+=======
+kiko
+>>>>>>> MERGE-SOURCE
 
 # EMEA
-markashtonb
 5ello
-irdezfer
 molinari-dario
 idobos
+ivoks
+mmenkhof
+matt-jarvis
 
 # APAC
 zhanglei-mao
 nobuto
-takaakisuzuki

=== modified file 'PACKAGES.list'
--- PACKAGES.list	2016-05-19 22:40:57 +0000
+++ PACKAGES.list	2017-04-25 19:02:06 +0000
@@ -39,7 +39,8 @@
 nload
 traceroute
 python-openstackclient
-
+# Moved from main script body
+run-one
 # automate USB-serial operations
 expect
 picocom

=== removed file 'VARS'
--- VARS	2016-05-19 22:40:57 +0000
+++ VARS	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-TESTED_BIOS_REVISION=0027

=== removed file 'amt_vnc_config.sh'
--- amt_vnc_config.sh	2016-12-07 17:37:21 +0000
+++ amt_vnc_config.sh	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-#!/bin/bash
-#
-#    Script to modify physical OrangeBox nodes, setting the amt settings correctly 
-#    Copyright (C) 2016 Canonical Ltd.
-#
-#    Authors: Scott Croft <[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
-#    the Free Software Foundation, version 3 of the License.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-#set -aux
-
-usage()
-{
-cat << EOF
-usage: $0 options
-
-This script to setup amt on the node(s)
-
-OPTIONS:
-   -h      Show this message
-   -a      Sets the amt port configuration for all nodes
-   -s <node #> Sets the amt configuration for a single node numbering between 11 and 20 where
-               node1 is equal to 11, node2 - 12, etc.
-EOF
-}
-
-if [ "$(id -u)" != "0" ]; then
-  echo "Must be run with sudo or by root"
-  exit 77
-fi
-
-# Get ob number
-#
-ob_number=`hostname | cut -c 10- -`
-
-AMT_PASSWORD=Password1+
-
-all_nodes(){
-       for amtnum in {11..20}
-       do
-             # Set AMT to work with VNC and Remmina
-             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${amtnum} -P 16992 -u admin -p ${AMT_PASSWORD} -k RFBPassword=Ubuntu1+ > /dev/null 2>&1
-             # enable KVM redirection to port 5900
-             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${amtnum} -P 16992 -u admin -p ${AMT_PASSWORD} -k Is5900PortEnabled=true > /dev/null 2>&1
-             # disable opt-in policy
-             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${amtnum} -P 16992 -u admin -p ${AMT_PASSWORD} -k OptInPolicy=false > /dev/null 2>&1
-             # disable session timeout
-             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${amtnum} -P 16992 -u admin -p ${AMT_PASSWORD} -k SessionTimeout=0 > /dev/null 2>&1
-             # enable KVM
-             wsman invoke -a RequestStateChange http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_KVMRedirectionSAP -h 172.27.${ob_number}.${amtnum} -P 16992 -u admin -p ${AMT_PASSWORD} -k RequestedState=2 > /dev/null 2>&1
-       done
-}
-
-single_node(){
-         if [ ${node} -lt 11 ] || [ ${node} -gt 20 ];then
-              echo "The node numbers range from 11-20"
-              exit 1
-         fi
-         wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${node} -P 16992 -u admin -p ${AMT_PASSWORD} -k RFBPassword=Ubuntu1+ > /dev/null 2>&1
-             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${node} -P 16992 -u admin -p ${AMT_PASSWORD} -k Is5900PortEnabled=true > /dev/null 2>&1
-             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${node} -P 16992 -u admin -p ${AMT_PASSWORD} -k OptInPolicy=false > /dev/null 2>&1
-             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${node} -P 16992 -u admin -p ${AMT_PASSWORD} -k SessionTimeout=0 > /dev/null 2>&1
-             wsman invoke -a RequestStateChange http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_KVMRedirectionSAP -h 172.27.${ob_number}.${node} -P 16992 -u admin -p ${AMT_PASSWORD} -k RequestedState=2 > /dev/null 2>&1
-}
-
-if (($# == 0)); then
-  usage
-fi
-
-while getopts "ahs:" OPTION
-do
-     case $OPTION in
-         a)
-             echo "Working"
-             all_nodes
-             echo "Done"
-             ;;
-         h)
-             usage
-             exit 1
-             ;;
-         s)
-             node=$2
-             echo "Working"
-             single_node
-             echo "Done"
-             ;;
-         ?)
-             usage
-             exit
-             ;;
-        \?)
-             echo "Invalid option: -$OPTARG" >&2
-             usage
-             exit
-             ;;
-     esac
-done

=== removed file 'archive.conf'
--- archive.conf	2016-05-19 22:40:57 +0000
+++ archive.conf	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-<VirtualHost *:80>
-	ServerName archive.ubuntu.com
-	ServerAdmin webmaster@localhost
-	DocumentRoot /srv/mirrors/archive.ubuntu.com/
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
-	<Directory /srv/mirrors/archive.ubuntu.com/>
-	        Options Indexes FollowSymLinks Multiviews
-		Require all granted
-	</Directory>
-</VirtualHost>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

=== removed directory 'bin'
=== removed file 'bin/change-juju-password.exp'
--- bin/change-juju-password.exp	2016-06-16 18:42:07 +0000
+++ bin/change-juju-password.exp	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-#!/usr/bin/expect -f
-if {$argc!=3} {
-   send_user "usage: $argv0 controller username password \n"
-   send_user "ex: $argv0 maas-controller admin canonical\n\n"
-   exit
-}
-log_user 0
-set timeout -1
-match_max 100000
-# juju controller
-set JUJU_CONTROLLER [lindex $argv 0]
-# set username
-set JUJU_USER [lindex $argv 1]
-# store password
-set JUJU_PASS [lindex $argv 2]
-# spawn a shell
-spawn $env(SHELL)
-# send juju change password command
-# Add logic to do current user controller/user
-send -- "juju change-user-password -c $JUJU_CONTROLLER $JUJU_USER\r"
-expect "*assword:"
-send "$JUJU_PASS\r"
-expect  "*again:"
-send "$JUJU_PASS\r"
-expect "*pdated."
-send "\r"
-send_user "$argv0 completed successfully.\n"
-

=== removed file 'bin/verify.sh'
--- bin/verify.sh	2016-05-19 22:40:57 +0000
+++ bin/verify.sh	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-set -e
-set -u
-
-BIOS_PREFIX=MYBDWi5v.86A.
-USERNAME=ubuntu
-HOSTNAME_REGEX='OrangeBox[0-9][0-9]'
-
-. VARS
-
-ERROR=
-log() {
-    type=$1
-    format=$2
-    shift 2
-    case $type in
-        error)
-            printf '\e[1;31mERROR:\e[0m   '
-            # shellcheck disable=SC2059
-            printf "${format}\n" "$@"
-            ERROR=1
-        ;;
-        warn)
-            printf '\e[1;33mWARNING:\e[0m '
-            # shellcheck disable=SC2059
-            printf "${format}\n" "$@"
-        ;;
-        info)
-            printf '\e[0;32mINFO:\e[0m    '
-            # shellcheck disable=SC2059
-            printf "${format}\n" "$@"
-        ;;
-        *)
-            echo 'log: unknown type specified.'
-            exit 1
-        ;;
-    esac
-}
-
-check_bios_revision() {
-    bios_version=$(sudo dmidecode -s bios-version | cut -d' ' -f2)
-    bios_revision=${bios_version#$BIOS_PREFIX}
-    bios_revision=${bios_revision%%.*}
-
-    if [ "$bios_revision" = "$TESTED_BIOS_REVISION" ]; then
-        log info 'You have the tested BIOS revision - %s' "$TESTED_BIOS_REVISION"
-    else
-        log warn 'The current tested BIOS revision is %s, but you have revision %s' "$TESTED_BIOS_REVISION" "$bios_revision"
-    fi
-}
-
-check_hostname() {
-    if echo "$HOSTNAME" | egrep -q "^${HOSTNAME_REGEX}$"; then
-        log info 'hostname is OK - %s' "$HOSTNAME"
-    else
-        log error 'hostname must meet the regex "%s"' "$HOSTNAME_REGEX"
-    fi
-}
-
-check_username() {
-    if [ "$USER" = "$USERNAME" ]; then
-        log info 'username is OK - %s' "$USERNAME"
-    else
-        log error 'username must be "%s"' "$USERNAME"
-    fi
-}
-
-# get sudo permission
-sudo true
-
-check_bios_revision
-check_hostname
-check_username
-
-if [ "$ERROR" = 1 ]; then
-    exit 1
-fi

=== removed file 'fabric.sh'
--- fabric.sh	2016-05-19 22:40:57 +0000
+++ fabric.sh	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-ob_number=`hostname | cut -c 10- -`
-
-vlanid=$(maas admin vlans read 2 |grep id |grep -v vid | awk -F, '{print $1}'|awk '{print $2}')
-sub_net="172.27.`expr ${ob_number} + 2`.0/23"
-#configure eth1 for fabric-1 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)
-     echo $system_id
-     interface=$(maas admin nodes read hostname=node${nodenum}ob${ob_number} |grep enx |cut -d'"' -f4)
-     echo $interface
-     maas admin interface update $system_id $interface vlan=$vlanid
-     maas admin interface link-subnet $system_id $interface mode=auto subnet="$sub_net"
-done

=== removed file 'import_SA_keys.sh'
--- import_SA_keys.sh	2016-05-19 22:40:57 +0000
+++ import_SA_keys.sh	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e
-set -u
-
-authorized_keys=~/.ssh/authorized_keys
-if [ -e $authorized_keys ]; then
-    mv $authorized_keys $authorized_keys.old
-fi
-
-if [ -e ~maas/.ssh/id_rsa.pub ]; then
-    #copy maas user's ssh key
-    sudo cat ~maas/.ssh/id_rsa.pub > $authorized_keys
-fi
-
-while read user; do
-    user=${user%%#*}
-    [ -n "$user" ] && ssh-import-id "$user"
-done < LP_USERS.list

=== added directory 'scripts'
=== added file 'scripts/04a-mod_virtual_nodes.sh'
--- scripts/04a-mod_virtual_nodes.sh	1970-01-01 00:00:00 +0000
+++ scripts/04a-mod_virtual_nodes.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,57 @@
+#!/bin/bash
+#
+#    Script to modify virtual OrangeBox nodes in MAAS
+#    Copyright (C) 2016 Canonical Ltd.
+#
+#    Authors: Scott Croft <[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
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+set -aux
+
+# Source file to get OB number variable
+. /etc/orange-box.conf
+
+# If user is not root then exit
+if [ "$(id -u)" != "0" ]; then
+  echo "Must be run with sudo or by root"
+  exit 77
+fi
+
+# Ensure the MAAS URL is set correctly
+MAAS_URL=http://172.27.${orangebox_number}.1/MAAS
+
+# set apikey variable
+apikey=`maas-region apikey --username admin | tail -n1`
+
+# login to MAAS
+maas login admin $MAAS_URL $apikey
+
+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)
+        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
+	do
+		maas admin subnet read $subnet_id|grep "\"cidr\": \"${sub_net}\"" 1>/dev/null
+		if [[ $? -eq 0 && ${eth1_set} -eq 1 ]]
+		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}')
+			maas admin interface update $system_id eth1 vlan=$vlanid
+			maas admin interface link-subnet $system_id eth1 mode=auto subnet="$sub_net"
+		fi
+	done
+done

=== added file 'scripts/05a-mod_physical_nodes.sh'
--- scripts/05a-mod_physical_nodes.sh	1970-01-01 00:00:00 +0000
+++ scripts/05a-mod_physical_nodes.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,74 @@
+#!/bin/bash
+#
+#    Script to add physical OrangeBox nodes to MAAS
+#    Copyright (C) 2016 Canonical Ltd.
+#
+#    Authors: Scott Croft <[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
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+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
+
+# Get ob number
+#
+ob_number=`hostname | cut -c 10- -`
+
+# Ensure the MAAS URL is set correctly
+#
+MAAS_URL=http://172.27.${ob_number}.1/MAAS
+
+# set apikey variable
+#
+apikey=`maas-region apikey --username admin | tail -n1`
+
+# login to MAAS
+#
+maas login admin $MAAS_URL $apikey
+
+# Configure second usb interface for second fabric and proper subnet
+#
+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
+done

=== added file 'scripts/add_physical_nodes.sh'
--- scripts/add_physical_nodes.sh	1970-01-01 00:00:00 +0000
+++ scripts/add_physical_nodes.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,147 @@
+#!/bin/bash
+#
+#    Script to add physical OrangeBox nodes to MAAS
+#    Copyright (C) 2016 Canonical Ltd.
+#
+#    Authors: Scott Croft <[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
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# set -aux
+
+source ob_profile.sh
+
+# Get the real node number
+get_real_node_number(){
+
+    local node_num=$(($1 - 10))
+    if [ $node_num -lt 10 ]; then
+        real_node_num="0${node_num}"
+    else
+        real_node_num=$node_num
+    fi
+    echo $real_node_num
+
+}
+
+# Get the MAC of the AMT via the ARP table
+# $1 - AMT IP address
+get_amt_mac(){
+
+    local amt_ipaddress=$1
+    ping -c 2 "$amt_ipaddress" >/dev/null
+    mac=$( arp -n | grep "$amt_ipaddress" | awk '{print $3}' )
+    echo "$mac"
+
+}
+
+# Add a node to MAAS
+# $1 - AMT IP address
+# $2 - Hostname
+# $3 - AMT MAC address
+add_node_to_maas(){
+
+    local amt_ipaddress=$1; shift
+    local hostname=$1; shift
+    local mac_address=$1; shift
+    if maas admin machines create \
+        architecture=amd64 \
+        power_type=amt \
+        power_parameters_power_address="$amt_ipaddress" \
+        power_parameters_power_pass="$AMT_PASSWORD" \
+        mac_addresses="$mac_address" \
+        hostname="$hostname"; then
+            system_id=$(maas admin nodes read mac_address="$mac_address" | grep -m 1 system_id | cut -d'"' -f4)
+            local -i retval=0
+    else
+        local -i retval=1
+        echo "Unable to create machine $hostname"
+        exit $retval
+    fi
+    return $retval
+
+}
+
+# Assign tags to each node
+# $1 - MAAS system ID
+assign_maas_tags(){
+
+    local system_id=$1
+    local -i retval=0
+    echo "Assigning MAAS tags for $system_id"
+    for tag in physical use-fastpath-installer; do
+         maas admin tag update-nodes "$tag" add="$system_id" || local -i retval=1
+    done
+    return $retval
+
+}
+
+# Determine which zone nodes should be added to
+# $1 - node number
+# $2 - MAAS system ID
+set_zone(){
+
+    local -i retval=0;
+    local node_num=$1; shift
+    local system_id=$1; shift
+    if [ "$node_num" -lt 6 ]; then
+        zone="zone1"
+    else
+        zone="zone2"
+    fi
+    echo "Node $node_num should be in $zone - assigning"
+    maas admin nodes set-zone zone="$zone" nodes="$system_id" || local -i retval=1
+    return $retval
+
+}
+
+main(){
+
+    if ! check_for_root; then
+        echo "ERROR: This script needs to be run as root"
+        exit 1
+    fi
+
+    login_to_maas
+
+    for amt_num in {11..20}; do
+
+        amt_ipaddress=${IP_ROOT}.${OB_NUM}.${amt_num}
+        mac_address=$(get_amt_mac "$amt_ipaddress")
+        echo "Found MAC $mac_address for AMT IP $amt_ipaddress"
+        echo "Configuring AMT $amt_ipaddress"
+
+        node_num=$(get_real_node_number $amt_num)
+        hostname=node${node_num}ob${OB_NUM}
+        echo "This node has hostname $hostname"
+
+        echo "Adding ${hostname} to MAAS"
+        if ! add_node_to_maas "$amt_ipaddress" "$hostname" "$mac_address"; then
+            echo "ERROR: Could not add node ${hostname}"
+            exit 1
+        fi
+
+        # Assume these are non-critical so warn but don't exit 
+        echo "Assigning MAAS tags for ${hostname}"       
+        system_id=$(maas admin nodes read mac_address="$mac_address" | grep -m 1 system_id | cut -d'"' -f4)
+        if ! assign_maas_tags "$system_id"; then
+            echo "Could not set tags correctly for $hostname"
+        fi
+
+        echo "Configuring zones in MAAS"
+        set_zone "$node_num" "$system_id"
+    done
+}
+
+main "$@"

=== added file 'scripts/add_virtual_nodes.sh'
--- scripts/add_virtual_nodes.sh	1970-01-01 00:00:00 +0000
+++ scripts/add_virtual_nodes.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,212 @@
+#!/bin/bash
+#
+#    orange-box-setup-kvms - create some virtual machines
+#    Copyright (C) 2014 Canonical Ltd.
+#
+#    Authors: Ronald McCollam <[e-mail]>
+#             Dustin Kirkland <[e-mail]>
+#    Modified: Scott Croft <[e-mail]> 2016
+#    Modified: Matt Jarvis <[e-mail]> 2017
+#
+#    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
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+source ob_profile.sh
+
+# Remove default domain
+remove_default_domain(){
+
+    if virsh net-info default &>/dev/null; then
+        virsh net-undefine default
+        virsh net-destroy default
+    fi
+
+}
+
+# Check the directories we need exist
+check_maas_dirs(){
+    
+    if [ ! -d /var/lib/maas/.ssh ]; then
+        mkdir /var/lib/maas/.ssh
+        chown maas:maas /var/lib/maas/.ssh
+    fi
+    
+}
+
+# Create the /srv/obvms directory for storing the virtual machines files
+create_vm_storage(){
+
+    if ! [ -d /srv/obvms ]; then
+        mkdir /srv/obvms
+    fi
+    chown -R libvirt-qemu:kvm /srv/obvms
+
+}
+
+# Check the MAAS user has an ssh key
+check_maas_sshkeys(){
+
+    if [ ! -f /var/lib/maas/.ssh/id_rsa ]; then
+        chsh maas -s /bin/bash
+        sudo -u maas ssh-keygen -N "" -t rsa -f /var/lib/maas/.ssh/id_rsa >/dev/null
+    fi
+
+}
+
+# Check the ubuntu user has the MAAS SSH key in authorized keys
+check_ubuntu_authkeys(){
+    
+    if [ ! -f /home/ubuntu/.ssh/authorized_keys ]; then
+        mkdir /home/ubuntu/.ssh/
+        touch /home/ubuntu/.ssh/authorized_keys
+        chown -R ubuntu /home/ubuntu/.ssh/
+        chmod 700 /home/ubuntu/.ssh/
+        chmod 644 /home/ubuntu/.ssh/authorized_keys
+    fi
+    cat /var/lib/maas/.ssh/id_rsa.pub >> /home/ubuntu/.ssh/authorized_keys
+
+}
+
+# Create zone0 for virtual nodes
+create_zone0(){
+
+    if ! maas admin zone read zone0 >/dev/null 2>&1; then
+		maas admin zones create name=zone0 description="Virtual machines on node0"
+	fi
+
+}
+
+# Add host key signature
+add_host_key_sig(){
+    # shellcheck disable=SC2024
+    sudo -u maas ssh-keyscan "$INTERNAL1_IP" >> /var/lib/maas/.ssh/known_hosts 2>/dev/null
+}
+
+add_node0_key(){
+    # shellcheck disable=SC2183
+    printf "%s,%s %s %s\n" "node0.maas" "$INTERNAL1_IP" "$(awk '{print $1 " " $2}' /etc/ssh/ssh_host_ecdsa_key.pub)" | tee -a /var/lib/maas/.ssh/known_hosts
+}
+
+cleanup_keys(){
+    sudo -u maas virsh -c qemu+ssh://ubuntu@"${INTERNAL1_IP}"/system list > /dev/null || sed -i '/ maas@/d' /home/ubuntu/.ssh/authorized_keys
+}
+
+# Install a virtual machine
+# $1 - hostname
+install_vm(){
+	
+	virsh destroy "$1" || true
+	virsh undefine "$1" || true
+	echo "INFO: Installing virtual machine $1"
+	if [ "$1" = "node00vm0ob${OB_NUM}.maas" ]; then
+		ram=6144
+	else
+        ram=4096
+    fi
+    virt-install --name "$1" \
+                 --ram $ram \
+                 --disk=path=/srv/obvms/"$1"-1.img,size=20 \
+                 --disk=path=/srv/obvms/"$1"-2.img,size=2 \
+                 --vcpus=2 \
+                 --os-type=linux \
+                 --pxe \
+                 --network=bridge=br0 \
+                 --network=bridge=br0 \
+                 --boot network \
+                 --video=cirrus \
+                 --graphics vnc
+    virsh console "$1" || true
+    virsh autostart "$1"
+
+}
+
+# Update MAAS for a given hostname
+# $1 - hostname
+update_maas(){
+    
+    local -i retval=0    
+	mac=$(virsh dumpxml "$1" | 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 -m 1 system_id | cut -d'"' -f4)
+
+	if [ -n "$system_id" ]; then
+    	maas admin machine update "$system_id" \
+                                  hostname="$hostname" \
+                                  power_type=virsh \
+                                  power_parameters_power_address=qemu+ssh://ubuntu@"${INTERNAL1_IP}"/system \
+                                  power_parameters_power_id="$hostname"
+        maas admin tag update-nodes "virtual" add="$system_id"
+        case $i in
+            0)
+                maas admin tag update-nodes "bootstrap" add="$system_id"
+                ;;
+            1)
+                maas admin tag update-nodes "neutron" add="$system_id"
+                ;;
+        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 "Could not find node $hostname in MAAS"
+        local -i retval=1
+    fi
+    return $retval
+
+}
+
+main(){
+
+    echo "Creating virtual nodes"
+
+    if ! check_for_root; then
+        echo "ERROR: This script must be run as root"
+        exit 1
+    fi
+
+    echo "Login to MAAS"
+    login_to_maas
+
+    echo "Checking MAAS configuration"
+    check_maas_dirs
+    
+    echo "Configuring keys"
+    check_maas_sshkeys
+    
+    add_host_key_sig
+
+    check_ubuntu_authkeys
+
+    echo "Creating zone0 in MAAS"
+    create_zone0
+    echo -e "\n"
+
+    add_node0_key
+    
+    echo "Creating virtual machine storage"
+    create_vm_storage
+
+    echo "Removing default domain"
+    remove_default_domain
+
+	for i in {0..2}; do
+        hostname="node00vm${i}ob${OB_NUM}.maas"
+        echo "Installing ${hostname}"
+		install_vm "$hostname"
+        echo -e "\n"
+        echo "Configuring MAAS for ${hostname}"
+		update_maas "$hostname"
+        echo -e "\n"
+	done
+
+}
+
+main "$@"

=== added file 'scripts/amt_vnc_config.sh'
--- scripts/amt_vnc_config.sh	1970-01-01 00:00:00 +0000
+++ scripts/amt_vnc_config.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,109 @@
+#!/bin/bash
+#
+#    Script to modify physical OrangeBox nodes, setting the amt settings correctly 
+#    Copyright (C) 2016 Canonical Ltd.
+#
+#    Authors: Scott Croft <[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
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+#set -aux
+
+usage()
+{
+cat << EOF
+usage: $0 options
+
+This script to setup amt on the node(s)
+
+OPTIONS:
+   -h      Show this message
+   -a      Sets the amt port configuration for all nodes
+   -s <node #> Sets the amt configuration for a single node numbering between 11 and 20 where
+               node1 is equal to 11, node2 - 12, etc.
+EOF
+}
+
+if [ "$(id -u)" != "0" ]; then
+  echo "Must be run with sudo or by root"
+  exit 77
+fi
+
+# Get ob number
+#
+ob_number=`hostname | cut -c 10- -`
+
+AMT_PASSWORD=Password1+
+
+all_nodes(){
+       for amtnum in {11..20}
+       do
+             # Set AMT to work with VNC and Remmina
+             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${amtnum} -P 16992 -u admin -p ${AMT_PASSWORD} -k RFBPassword=Ubuntu1+ > /dev/null 2>&1
+             # enable KVM redirection to port 5900
+             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${amtnum} -P 16992 -u admin -p ${AMT_PASSWORD} -k Is5900PortEnabled=true > /dev/null 2>&1
+             # disable opt-in policy
+             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${amtnum} -P 16992 -u admin -p ${AMT_PASSWORD} -k OptInPolicy=false > /dev/null 2>&1
+             # disable session timeout
+             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${amtnum} -P 16992 -u admin -p ${AMT_PASSWORD} -k SessionTimeout=0 > /dev/null 2>&1
+             # enable KVM
+             wsman invoke -a RequestStateChange http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_KVMRedirectionSAP -h 172.27.${ob_number}.${amtnum} -P 16992 -u admin -p ${AMT_PASSWORD} -k RequestedState=2 > /dev/null 2>&1
+       done
+}
+
+single_node(){
+         if [ ${node} -lt 11 ] || [ ${node} -gt 20 ];then
+              echo "The node numbers range from 11-20"
+              exit 1
+         fi
+         wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${node} -P 16992 -u admin -p ${AMT_PASSWORD} -k RFBPassword=Ubuntu1+ > /dev/null 2>&1
+             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${node} -P 16992 -u admin -p ${AMT_PASSWORD} -k Is5900PortEnabled=true > /dev/null 2>&1
+             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${node} -P 16992 -u admin -p ${AMT_PASSWORD} -k OptInPolicy=false > /dev/null 2>&1
+             wsman put http://intel.com/wbem/wscim/1/ips-schema/1/IPS_KVMRedirectionSettingData -h 172.27.${ob_number}.${node} -P 16992 -u admin -p ${AMT_PASSWORD} -k SessionTimeout=0 > /dev/null 2>&1
+             wsman invoke -a RequestStateChange http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_KVMRedirectionSAP -h 172.27.${ob_number}.${node} -P 16992 -u admin -p ${AMT_PASSWORD} -k RequestedState=2 > /dev/null 2>&1
+}
+
+if (($# == 0)); then
+  usage
+fi
+
+while getopts "ahs:" OPTION
+do
+     case $OPTION in
+         a)
+             echo "Working"
+             all_nodes
+             echo "Done"
+             ;;
+         h)
+             usage
+             exit 1
+             ;;
+         s)
+             node=$2
+             echo "Working"
+             single_node
+             echo "Done"
+             ;;
+         ?)
+             usage
+             exit
+             ;;
+        \?)
+             echo "Invalid option: -$OPTARG" >&2
+             usage
+             exit
+             ;;
+     esac
+done

=== added file 'scripts/change-juju-password.exp'
--- scripts/change-juju-password.exp	1970-01-01 00:00:00 +0000
+++ scripts/change-juju-password.exp	2017-04-25 19:02:06 +0000
@@ -0,0 +1,28 @@
+#!/usr/bin/expect -f
+if {$argc!=3} {
+   send_user "usage: $argv0 controller username password \n"
+   send_user "ex: $argv0 maas-controller admin canonical\n\n"
+   exit
+}
+log_user 0
+set timeout -1
+match_max 100000
+# juju controller
+set JUJU_CONTROLLER [lindex $argv 0]
+# set username
+set JUJU_USER [lindex $argv 1]
+# store password
+set JUJU_PASS [lindex $argv 2]
+# spawn a shell
+spawn $env(SHELL)
+# send juju change password command
+# Add logic to do current user controller/user
+send -- "juju change-user-password -c $JUJU_CONTROLLER $JUJU_USER\r"
+expect "*assword:"
+send "$JUJU_PASS\r"
+expect  "*again:"
+send "$JUJU_PASS\r"
+expect "*pdated."
+send "\r"
+send_user "$argv0 completed successfully.\n"
+

=== added file 'scripts/fabric.sh'
--- scripts/fabric.sh	1970-01-01 00:00:00 +0000
+++ scripts/fabric.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+ob_number=`hostname | cut -c 10- -`
+
+vlanid=$(maas admin vlans read 2 |grep id |grep -v vid | awk -F, '{print $1}'|awk '{print $2}')
+sub_net="172.27.`expr ${ob_number} + 2`.0/23"
+#configure eth1 for fabric-1 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)
+     echo $system_id
+     interface=$(maas admin nodes read hostname=node${nodenum}ob${ob_number} |grep enx |cut -d'"' -f4)
+     echo $interface
+     maas admin interface update $system_id $interface vlan=$vlanid
+     maas admin interface link-subnet $system_id $interface mode=auto subnet="$sub_net"
+done

=== added file 'scripts/install_base_system.sh'
--- scripts/install_base_system.sh	1970-01-01 00:00:00 +0000
+++ scripts/install_base_system.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,167 @@
+#!/bin/bash
+#
+#    Base system installation for the OrangeBox
+#    Copyright (C) 2016 Canonical Ltd.
+#
+#    Authors: Scott Croft <[e-mail]>
+#             Matt Jarvis <[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
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# set -e
+# set -x
+
+source ob_profile.sh
+
+PACKAGE_LIST=../PACKAGES.list
+
+usage()
+{
+cat << EOF
+usage: $0 options
+
+This script installs the base system
+Allows selection of additional PPA's to use
+
+OPTIONS:
+   -h      Show this message
+   -p      Manually enter PPA URL's ( eg. ppa:/juju/stable)
+EOF
+}
+
+# Check to ensure that the user on the system is ubuntu and assigned the uid of 1000
+check_ubuntu_user(){
+
+    if [ "$(id -u ubuntu)" != "1000" ]; then
+        return 1
+    fi
+
+}
+
+# Check if a package is installed
+# $1 - package name
+check_package(){
+
+    local -i retval=0
+    if ! dpkg -l | grep -q "$package"; then
+        local -i retval=1
+    fi
+    return $retval
+
+}
+
+# Install the required packages for OrangeBox operation
+install_packages (){
+
+    local -i errors=0
+    local -i retval=0
+    # Ignore blank lines and bash style comments
+    egrep -v '^$|^#' $PACKAGE_LIST | while read -r package; do
+        if ! check_package "$package"; then
+            # shellcheck disable=SC2030            
+            apt-get install -qq -y "$package" || ((errors++))
+        fi
+    done
+    # shellcheck disable=SC2031           
+    if [ $errors -ne 0 ]; then
+        local -i retval=1
+    fi
+    return $retval 
+
+}
+
+# Setup PPA's for MAAS and Juju
+set_up_ppas(){
+
+    local jujuppa=$1; shift
+    local maasppa=$1; shift    
+    local -i retval=0
+    local -i errors=0
+    for ppa in $jujuppa $maasppa; do
+        echo "Adding PPA ${ppa}"
+        add-apt-repository -y "$ppa" || ((errors++))
+    done
+    if [ $errors -ne 0 ]; then
+        local -i retval=1
+    fi
+    return $retval
+
+}
+
+# Configure apt to use archive.ubuntu.com
+configure_apt_geos(){
+
+    sed -i.orig 's|http://.*archive|http://archive|g' /etc/apt/sources.list
+
+}
+
+main(){
+
+    if ! check_for_root; then
+        echo "ERROR: this script must be run as root"
+    fi
+
+    if ! check_ubuntu_user; then
+        echo "ERROR: OrangeBox setup requires the default user to be [ubuntu]"
+        exit 1
+    fi
+
+    # No arguments given - use default PPA's
+	if (($# == 0)); then
+		jujuppa="ppa:juju/stable"
+		maasppa="ppa:maas/stable"
+	fi
+
+	while getopts "hp" OPTION
+	do
+		case $OPTION in
+         	h)
+                usage
+                exit 0
+                ;;
+            p)
+                echo "Build system with custom PPA's"
+	            printf "Enter PPA URL for juju (eg. ppa:juju/stable):"
+    	        read -r jujuppa
+        	    printf "Enter PPA URL for maas (eg. ppa:maas-maintainers/stable):"
+           		read -r maasppa
+                ;;
+            \?)
+                usage
+                exit 1
+                ;;
+        esac
+    done
+
+    echo "Configuring PPA's"
+	if ! set_up_ppas "$jujuppa" "$maasppa"; then
+        echo "Unable to configure PPA's"
+        exit 1
+    fi
+    
+    echo "Configuring apt"
+    configure_apt_geos
+
+    echo "Updating system"
+    apt-get update -y
+    apt-get dist-upgrade -qq -y
+    
+    if ! install_packages; then
+        echo "Some required packages could not be installed"
+        exit 1
+    fi
+
+}
+
+main "$@"

=== added file 'scripts/ob_profile.sh'
--- scripts/ob_profile.sh	1970-01-01 00:00:00 +0000
+++ scripts/ob_profile.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,80 @@
+#
+#    Global variables and functions for OrangeBox install scripts
+#    Copyright (C) 2017 Canonical Ltd.
+#
+#    Authors: Matt Jarvis <[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
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Required BIOS revision
+TESTED_BIOS_REVISION=0027
+
+# Installer log file
+LOG_FILE=installer.log
+
+# Launchpad ID
+LAUNCHPAD_ID=matt-jarvis
+
+# Get OB number
+OB_NUM=`hostname | cut -c 10- -`
+
+# AMT Password
+AMT_PASSWORD=Password1+
+
+# Remmina password
+REMMINA_PASSWORD=Ubuntu1+
+
+# Main internal interface IP
+IP_ROOT=172.27
+INTERNAL1_IP=$IP_ROOT.${OB_NUM}.1
+
+# Set MAAS URL
+MAAS_URL=http://$INTERNAL1_IP/MAAS
+
+# Check how we were called
+check_for_root(){
+    local -i retval=0
+    if [ "$(id -u)" != "0" ]; then
+        local -i retval=1
+    fi
+    return $retval
+}
+
+# MAAS specific config
+# We only call these if MAAS is installed and configured
+if dpkg -l | grep maas >/dev/null; then
+    # Get MAAS cluster uuid
+    if check_for_root; then
+        CLUSTER_UUID=`grep cluster_uuid /etc/maas/rackd.conf |awk '{print $2}'`
+    fi
+    # Get MAAS API key - export it as we need it outside this shell
+    # FIXME this is fairly horrible, we need it in the juju setup script
+    if sudo maas-region apikey --username admin 1>/dev/null 2>&1; then 
+        export API_KEY=`sudo maas-region apikey --username admin | tail -n1`
+    fi
+fi
+# Login to MAAS
+login_to_maas(){
+    echo "Attempting to login to MAAS"
+    if maas login admin $MAAS_URL $API_KEY; then
+        local -i retval=0
+        echo "Login successful"
+        return $retval
+    else
+        local -i $retval=1
+        echo "Could not login to MAAS"
+        # No point in going on so bail out
+        exit $retval
+    fi
+}

=== added file 'scripts/obinstaller.sh'
--- scripts/obinstaller.sh	1970-01-01 00:00:00 +0000
+++ scripts/obinstaller.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+source ob_profile.sh
+
+if ! check_for_root; then
+    echo "ERROR: This script must be run as root"
+    exit 1
+fi
+
+if [ -f $LOG_FILE ]; then
+    rm $LOG_FILE
+    touch $LOG_FILE
+    chmod a+rw $LOG_FILE
+fi
+
+log_output(){
+    echo $1 | tee -a $LOG_FILE
+}
+
+log_output "Starting OrangeBox install for $(hostname) on $(date)"
+
+log_output "Configuring networks" 
+if ./setup_network.sh | tee -a $LOG_FILE; then
+    echo "Network configuration completed"
+fi
+
+log_output "Installing base system"
+if ./install_base_system.sh | tee -a $LOG_FILE; then
+    log_output "Base system installation completed"
+fi
+
+log_output "Configuring base system"
+if ./setup_base_system.sh | tee -a $LOG_FILE; then
+    log_output "Base system configuration completed"
+fi
+
+log_output "Configuring Apache"
+if ./setup_apache.sh | tee -a $LOG_FILE; then
+    log_output "Apache configuration completed"
+fi
+
+log_output "Configuring MAAS"
+if ./setup_maas_environment.sh | tee -a $LOG_FILE; then
+    log_output "MAAS configuration completed"
+fi
+
+log_output "Configuring physical hosts"
+if ./add_physical_nodes.sh | tee -a $LOG_FILE; then
+    log_output "Physical host configuration completed"
+else
+    echo "ERROR: Unable to configure physical hosts"
+    exit 1
+fi
+
+
+log_output "Configuring virtual hosts"
+if ./add_virtual_nodes.sh | tee -a $LOG_FILE; then
+    log_output "Virtual host configuration completed"
+else
+    echo "ERROR: Unable to configure virtual hosts"
+    exit 1
+fi
+
+log_output "Configuring Juju"
+if sudo -Eu ubuntu ./setup_juju_environment.sh | tee -a $LOG_FILE; then
+    log_output "Juju configuration completed"
+fi

=== added file 'scripts/setup_apache.sh'
--- scripts/setup_apache.sh	1970-01-01 00:00:00 +0000
+++ scripts/setup_apache.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,52 @@
+#!/bin/bash
+#
+#    Setup of OrangeBox network
+#    Copyright (C) 2014 Canonical Ltd.
+#
+#    Authors:  Scott Croft <[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
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+# script to configure apache
+#
+# set -e
+# set -x
+
+source ob_profile.sh
+
+# Configure apache so that the base URL reaches MAAS
+setup_apache() {
+
+    mkdir -p /srv/mirrors/archive.ubuntu.com
+    echo '<meta http-equiv="refresh" content="0; url=MAAS/">' > /srv/mirrors/archive.ubuntu.com/index.html
+    invoke-rc.d apache2 stop || true
+    invoke-rc.d apache2 start
+
+}
+
+main(){
+    
+    echo "Configuring Apache for MAAS"
+
+    if ! check_for_root; then
+        echo "ERROR: This script needs to be run as root"
+        exit 1
+    fi
+    
+    setup_apache
+
+}
+
+main "$@"

=== added file 'scripts/setup_base_system.sh'
--- scripts/setup_base_system.sh	1970-01-01 00:00:00 +0000
+++ scripts/setup_base_system.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,181 @@
+#!/bin/bash
+#
+#    Base system configuration for the OrangeBox
+#    Copyright (C) 2016 Canonical Ltd.
+#
+#    Authors: Scott Croft <[e-mail]>
+#             Matt Jarvis <[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
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# set -e
+# set -x
+
+# FIXME this could be split out into package related and other config
+
+source ob_profile.sh
+
+KEYS_LIST=../LP_USERS.list
+
+usage()
+{
+cat << EOF
+usage: $0 options
+
+This script configures the base system
+Can also be used to update the authorized keys if the list has changed
+
+OPTIONS:
+   -h      Show this message
+   -k      Update authorized keys only
+EOF
+}
+
+# Check to ensure that the user on the system is ubuntu and assigned the uid of 1000
+check_ubuntu_user(){
+
+    if [ "$(id -u ubuntu)" != "1000" ]; then
+        return 1
+    fi
+
+}
+
+# Configure the SSH service
+configure_ssh(){
+
+    # Disable remote password authentication for security purposes
+    if ! grep -qs "^PasswordAuthentication no" /etc/ssh/sshd_config; then
+        echo "PasswordAuthentication no" >> /etc/ssh/sshd_config
+        invoke-rc.d ssh stop || true
+        invoke-rc.d ssh start
+    fi
+
+}
+
+# Setup SSH for the ubuntu user
+setup_ubuntu_ssh(){
+
+    # Ensure the ubuntu user has an SSH key
+    if [ ! -e /home/ubuntu/.ssh/id_rsa ]; then
+        su -l ubuntu -c "ssh-keygen -N '' -f /home/ubuntu/.ssh/id_rsa"
+    fi
+    # Install SSH client config
+    install -o ubuntu -g ubuntu -m 0600 template/ssh_config ~ubuntu/.ssh/config
+
+}
+
+install_keys(){
+
+    local -i retval=0
+    local -i errors=0
+    authorized_keys=/home/ubuntu/.ssh/authorized_keys
+    if [ -e $authorized_keys ]; then
+        mv $authorized_keys $authorized_keys.old
+    fi
+
+    # Ignore blank lines and bash style comments
+    egrep -v '^$|^#' $KEYS_LIST | while read -r user; do
+        # shellcheck disable=SC2030
+        su -l ubuntu -c "ssh-import-id ${user}" || ((errors++))
+    done
+
+    # Install the user listed in the profile configuration
+    # shellcheck disable=SC2031
+    su -l ubuntu -c "ssh-import-id ${LAUNCHPAD_ID}" || ((errors++))
+
+    if [ $errors -ne 0 ]; then
+        local -i retval=1
+    fi
+    return $retval 
+
+}
+
+setup_landscape() {
+
+    # The master node will be managed by Landscape
+    # FIXME - this appears to fail with invalid account name or registration key - expected behaviour ? 
+    if which landscape-config; then
+        case "$(hostname)" in
+            OrangeBox*|orangebox*)
+                landscape-config -a cpe-sa -t "$(hostname)__$(dmidecode -s baseboard-serial-number)" --script-users=ALL --silent --include-manager-plugins=ScriptExecution || true
+                ;;
+        esac
+    fi
+
+}
+
+disable_crash_reporter(){
+
+    # Disable Ubuntu crash reporter
+    echo "enabled=0" | sudo tee /etc/default/apport
+
+    # Stop Ubuntu crash reporter
+    sudo invoke-rc.d apport stop || true
+
+}
+
+
+main(){
+
+    if ! check_for_root; then
+        echo "ERROR: this script must be run as root"
+    fi
+
+    if ! check_ubuntu_user; then
+        echo "ERROR: OrangeBox setup requires the default user to be [ubuntu]"
+        exit 1
+    fi
+
+    # No arguments given - use default PPA's
+	if (($# != 0)); then
+		while getopts "hk" OPTION
+    	do
+        	case $OPTION in
+            	h)
+                	usage
+                	exit 0
+                	;;
+            	k)
+                	echo "Updating authorized keys"
+                	install_keys
+                	exit 0
+                	;;
+            	\?)
+                	usage
+                	exit 1
+                	;;
+        	esac
+    	done
+    fi
+
+	echo "Configuring SSH daemon"
+    configure_ssh
+    
+    echo "Configuring SSH for the ubuntu user"
+    setup_ubuntu_ssh
+
+	echo "Configuring Landscape"
+	setup_landscape
+
+	echo "Disabling crash reporter"
+	disable_crash_reporter
+
+    echo "Installing additional authorized keys"
+    if ! install_keys; then
+       	echo "Some keys could not be installed"
+    fi
+
+}
+
+main "$@"

=== added file 'scripts/setup_juju_environment.sh'
--- scripts/setup_juju_environment.sh	1970-01-01 00:00:00 +0000
+++ scripts/setup_juju_environment.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,179 @@
+#!/bin/bash
+
+#set -e
+#set -x
+
+source ob_profile.sh
+
+MAAS_JUJU_NAME=maas-controller
+
+setup_juju_1(){
+
+    mkdir -p /home/ubuntu/.juju
+    cat >/home/ubuntu/.juju/environments.yaml <<EOF
+default: maas
+environments:
+    maas:
+        type: maas
+        maas-server: '${MAAS_URL}'
+        maas-oauth: '${API_KEY}'
+        default-series: trusty
+        #enable-os-upgrade: false
+        authorized-keys-path: /home/ubuntu/.ssh/id_rsa.pub
+        admin-secret: 'admin'
+        logging-config: '<root>=DEBUG'
+        lxc-clone: true
+EOF
+    echo "export JUJU_DEV_FEATURE_FLAGS=maas2" >> /home/ubuntu/.bashrc
+
+}
+
+setup_juju_2(){
+
+    maas_yaml=/home/ubuntu/.juju/juju_maas.yaml
+	cat >$maas_yaml<<EOF
+clouds:
+   $MAAS_JUJU_NAME:
+      type: maas
+      auth-types: [oauth1]
+      endpoint: $MAAS_URL
+credentials:
+   $MAAS_JUJU_NAME:
+      admin:
+         auth-type: oauth1
+         maas-oauth: $API_KEY
+EOF
+    if ! juju list-clouds | grep -q maas; then
+        juju add-cloud $MAAS_JUJU_NAME $maas_yaml
+        juju add-credential $MAAS_JUJU_NAME -f $maas_yaml
+    fi
+
+}
+
+bootstrap_juju_2(){
+    juju update-clouds
+    if juju bootstrap --to node00vm0ob"${OB_NUM}".maas --show-log $MAAS_JUJU_NAME maas/"${INTERNAL1_IP}"
+    then
+        juju show-controller --show-password maas/"${INTERNAL1_IP}" | egrep "user|password"
+        URL=$(juju gui --no-browser)
+        # Start Chromium with flags to ignore certificate errors and avoid pop up complaining about ignoring them
+        chromium-browser --ignore-certificate-errors --test-type "$URL"
+    fi
+}
+
+install_juju_plugins(){
+
+    plugin_path=/home/ubuntu/.juju-plugins
+    rm -rf $plugin_path
+    git clone https://github.com/juju/plugins $plugin_path
+    echo "PATH=\$PATH:${plugin_path}:/home/ubuntu/Examples/bin" >> /home/ubuntu/.bashrc
+
+}
+
+setup_desktop() {
+
+    # connect running session bus if any
+    dbus_session_bus_address=$(pgrep -u "$USER" -af 'dbus-daemon --fork --session' | grep -o 'unix:.*' || true)
+    if [ -n "$dbus_session_bus_address" ]; then
+        env DBUS_SESSION_BUS_ADDRESS="$dbus_session_bus_address" \
+            dconf load / < ../template/dconf.txt
+    else
+        dbus-launch dconf load / < ../template/dconf.txt
+    fi
+
+}
+
+install_demos(){
+
+    if [[ -d /srv/sademos-15.10 ]]; then
+        cd /srv/sademos-15.10 || exit 1
+        bzr pull
+    else
+	    bzr branch lp:sademos /srv/sademos-15.10
+    fi
+    if [[ -d /srv/sademos-16.04 ]]; then
+        cd /srv/sademos-16.04 || exit 1
+        bzr pull
+    else
+	    bzr branch lp:sademos/16.04 /srv/sademos-16.04
+    fi
+    
+    ln -s /srv/sademos-16.04 /home/ubuntu/sademos-juju2 >/dev/null 2>&1
+    ln -s /srv/sademos-15.10 /home/ubuntu/sademos-juju1.25 >/dev/null 2>&1
+
+}
+
+setup_remmina() {
+
+    if [[ -d /home/ubuntu/.remmina ]]; then
+        echo "Remmina already setup"
+    else
+        echo "Setting up Remmina..."
+        mkdir /home/ubuntu/.remmina
+        for node_num in {1..10}
+        do
+            cat >/home/ubuntu/.remmina/node${node_num}.remmina <<EOF
+[remmina]
+keymap=
+ssh_auth=0
+quality=0
+disableencryption=0
+ssh_charset=
+ssh_privatekey=
+server=${IP_ROOT}.${OB_NUM}.$((node_num + 10))
+hscale=0
+group=
+password=${REMMINA_PASSWORD}
+name=node${node_num}
+ssh_loopback=0
+viewonly=0
+ssh_username=
+ssh_server=
+window_maximize=0
+aspectscale=0
+protocol=VNC
+window_height=825
+window_width=963
+vscale=0
+ssh_enabled=0
+username=admin
+showcursor=0
+disableserverinput=0
+colordepth=8
+disableclipboard=0
+viewmode=1             
+EOF
+        done
+        chown -R ubuntu:ubuntu /home/ubuntu/.remmina
+    fi
+
+}
+
+main(){
+
+    if check_for_root; then
+        echo "ERROR: This script needs to be run as the ubuntu user"
+        exit 1
+    fi
+
+    echo "Adding configuration for Juju 1.x"
+    setup_juju_1
+
+    echo "Adding configuration for Juju 2.x"
+    setup_juju_2
+
+    echo "Configuring desktop"
+    setup_desktop
+
+    echo "Configuring Remmina"
+    setup_remmina
+
+    echo "Installing demos"
+    install_demos
+
+    echo "Bootstrapping Juju 2"
+    bootstrap_juju_2
+
+}
+
+main "$@"

=== added file 'scripts/setup_maas_environment.sh'
--- scripts/setup_maas_environment.sh	1970-01-01 00:00:00 +0000
+++ scripts/setup_maas_environment.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,226 @@
+#!/bin/bash
+#
+#    Setup of OrangeBox MAAS environment
+#    Copyright (C) 2017 Canonical Ltd.
+#
+#    Authors: Scott Croft <[e-mail]>
+#             Matt Jarvis <[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
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# set -ax
+
+source ob_profile.sh
+
+# Set ip's for MAAS configuration
+DHCP_OCTETS=$IP_ROOT.$((OB_NUM + 1))
+NETWORK_OCTETS=$IP_ROOT.$OB_NUM
+DHCP_SUBNET=$IP_ROOT.${OB_NUM}.0/23
+
+# Create MAAS dynamic range
+create_dynamic_range(){
+    local dhcp_low=$DHCP_OCTETS.1
+    local dhcp_high=$DHCP_OCTETS.20
+    local -i retval=0
+    if ! maas admin ipranges create type=dynamic start_ip="$dhcp_low" end_ip="$dhcp_high"; then
+        local -i retval=1
+    fi
+    return $retval
+}
+
+# Create MAAS admin credentials
+create_maas_credentials(){
+    if ! maas-region apikey --username admin 1>/dev/null 2>&1;then
+	    if maas-region createadmin --username admin --email [e-mail] --password="admin";then
+            local -i retval=0
+        else
+            local -i retval=1
+        fi
+    fi
+    return $retval
+}
+
+# Add SSH key to MAAS
+add_maas_ssh_key(){
+    maas admin sshkeys create key="$(cat /home/ubuntu/.ssh/id_rsa.pub)" || true
+}
+
+# Update http config
+# FIXME this seems to be doing the same as the 02-apache setup script for a different root, are both needed ?
+update_http_conf(){
+    cat >/var/www/html/index.html <<EOF
+    <meta http-equiv="refresh" content="0; url=/MAAS">
+EOF
+}
+
+# Update subnet settings
+update_subnet(){
+    local -i retval=0
+    local gateway_ip=$NETWORK_OCTETS.1
+    local dns_servers=$NETWORK_OCTETS.1
+    local subnet=$NETWORK_OCTETS.0/23
+    maas admin subnet update "$subnet" gateway_ip="$gateway_ip" dns_servers="$dns_servers" || local -i retval=1
+    return $retval
+}
+
+# Update DNS settings
+update_dns(){
+	local dns_ip=$DHCP_OCTETS.254
+	local -i retval=0
+    declare -Ag maas_dns_config=( ["upstream_dns"]="${dns_ip}" ["dnssec_validation"]="no" ["kernel_opts"]="net.ifnames=0" )
+	for config in "${!maas_dns_config[@]}"; do
+        echo "Setting ${config}"
+        maas admin maas set-config name="$config" value="${maas_dns_config[$config]}" || local -i retval=1
+        echo -e "\n"
+    done
+	sed -e 's/dnssec-validation  auto;/dnssec-enable no;dnssec-validation no;/g' -i /etc/bind/named.conf.options
+	pkill -HUP named
+	return $retval
+}
+
+# Create required tags
+create_maas_tags(){
+    local -i retval=0
+    local -i errors=0
+    for tag in physical virtual neutron use-fastpath-installer; do
+        echo "Creating tag ${tag}"
+        maas admin tags create name=$tag || ((errors++))
+        echo -e "\n"
+    done
+    if [ $errors -ne 0 ]; then
+        local -i retval=1
+    fi
+    return $retval
+}
+
+# Configure DHCP
+configure_dhcp(){
+    maas admin subnets read | grep "\"id\"" | awk '{print $2}' | sed 's/,//' | egrep -x '.{1,2}' | while read -r subnet_id
+    do
+	    if maas admin subnet read "$subnet_id" | grep "\"cidr\": \"${DHCP_SUBNET}\"" 1>/dev/null
+	    then
+            maas_fabric=$(maas admin subnet read "$subnet_id" | grep -w fabric | awk '{print $2}' | sed 's/,//' | sed 's/\"//g')
+	        maas admin vlan update "$maas_fabric" untagged dhcp_on=True primary_rack="OrangeBox${OB_NUM}"
+	    fi
+    done
+}
+
+# Import boot images
+import_boot_images(){
+    local -i retval=0
+    local -i errors=0
+    for release in xenial trusty; do
+	    if ! maas admin boot-source-selections read 1 | grep -q $release; then
+            maas admin boot-source-selections create 1 \
+                os="ubuntu" \
+                release="$release" \
+                arches="amd64" \
+                subarches="*" \
+                labels="*" || ((errors++))            
+        fi
+    done
+    echo -e "\n"
+    if [ $errors -ne 0 ]; then
+        local -i retval=1
+    fi
+    maas admin boot-resources import
+	while [ "$(maas admin boot-resources read name="$CLUSTER_UUID" | wc -l)" -lt 10 ]; do
+	echo " Waiting for images to download"
+   		sleep 10
+	done
+    return $retval
+}
+
+# Add zones to MAAS for NUC's
+add_zones(){
+    local -i retval=0
+    declare -A zone_config=( ["zone1"]="Physical machines 1-5" ["zone2"]="Physical machines 6-10" )
+    for zone in "${!zone_config[@]}"; do
+        if ! maas admin zone read "$zone" >/dev/null; then
+            maas admin zones create name="$zone" description="${zone_config[$zone]}" || local -i retval=1
+        fi
+    done
+    return $retval
+}
+
+add_maas_key_to_authkeys(){
+    authorized_keys=/home/ubuntu/.ssh/authorized_keys
+    if [ -e ~maas/.ssh/id_rsa.pub ]; then
+        cat ~maas/.ssh/id_rsa.pub >> $authorized_keys
+    fi
+}
+
+main(){
+
+    if ! check_for_root; then
+        echo "ERROR: This script must be run as root"
+        exit 1
+    fi
+
+    if ! create_maas_credentials; then
+        echo "ERROR Could not create MAAS credentials"
+        exit 1
+    else
+        # Source the profile again now the admin user exists
+        source ob_profile.sh
+    fi
+
+    login_to_maas
+    # Echo newlines after MAAS commands since the MAAS output doesn't properly newline
+    # purely for display purposes in the log file and terminal output
+    echo -e "\n"
+    
+    echo "Configuring MAAS SSH keys"    
+    add_maas_ssh_key
+    echo -e "\n"
+
+    echo "Creating dynamic range"
+    create_dynamic_range
+    echo -e "\n"
+
+    echo "Configuring DHCP"
+    configure_dhcp
+    echo -e "\n"
+
+    echo "Updating subnet"
+    update_subnet
+    echo -e "\n"
+
+    update_http_conf
+
+    echo "Updating DNS"
+    update_dns
+    echo -e "\n"
+
+    echo "Importing boot images"
+    if ! import_boot_images; then
+        echo "Could not import all required boot images"
+    fi
+    echo -e "\n"
+
+    echo "Adding zones"
+    add_zones
+    echo -e "\n"\
+
+	echo "Adding tags"
+	if ! create_maas_tags; then
+        echo "Could not create all required tags"
+    fi
+	echo -e "\n"
+
+    add_maas_key_to_authkeys
+
+}
+
+main "$@"

=== added file 'scripts/setup_network.sh'
--- scripts/setup_network.sh	1970-01-01 00:00:00 +0000
+++ scripts/setup_network.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,239 @@
+#!/bin/bash
+#
+#    Setup of OrangeBox network
+#    Copyright (C) 2014 Canonical Ltd.
+#
+#    Authors: Dustin Kirkland <[e-mail]>
+#             Scott Croft <[e-mail]>
+#             Matt Jarvis <[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
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    
+# set -e
+# set -x
+
+source ob_profile.sh
+
+GATEWAY1_IP=$IP_ROOT.$((OB_NUM+1)).254
+INTERNAL2_IP=$IP_ROOT.$((OB_NUM+2)).1
+
+# Populate the OrangeBox config file
+set_orange_box_config(){
+    echo "orangebox_number=${OB_NUM}" > /etc/orange-box.conf
+}
+
+# Install bridge-utils packages
+install_bridge_packages(){
+    local -i retval=0
+    if ! dpkg -l | grep -q bridge-utils; then
+        if apt-get update; then
+            if ! apt-get install -y bridge-utils; then
+                local -i retval=1
+            fi
+        else
+            local -i retval=1
+        fi
+    fi
+    return $retval
+}
+
+# Get interface names of the 3 interfaces on node0 since in Xenial they aren't ethX anymore
+# See https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/
+# An array is declared and the interface names are placed into the array to be used later on
+create_interface_array(){
+    echo "Detecting network interfaces"
+    # Arrays in functions need to be declared explicitly as a global
+    declare -g INTERFACE=()
+    for iface in $(ip a | awk '{print $2}' | egrep 'enp|enx' | sed 's/://'); do
+        echo "Found interface $iface"
+        INTERFACE=("${INTERFACE[@]}" "$iface")
+    done
+    echo "Interface detection complete ${INTERFACE[*]}"
+}
+
+# Check to make sure the OrangeBox number is divisable by 4 to ensure the network is setup correctly
+check_orangebox_number() {
+    local num=$1
+    local -i retval=0
+    if [[ $((num/4)) -lt 1 ]]; then
+        local -i retval=1
+    fi
+    return $retval
+}
+
+# Set required kernel parameters for MAAS
+set_sysctls(){
+    for sysctl in "net.ipv4.ip_forward=1" "net.ipv4.conf.all.accept_redirects=1"; do
+        if ! grep -qx $sysctl /etc/sysctl.conf; then
+            echo $sysctl >> /etc/sysctl.conf
+        fi
+    done
+}
+
+# Check which interface is on which bridge-vlan
+check_interface_vlan(){
+    local -i retval=0
+    if ifconfig "${INTERFACE[1]}" "$INTERNAL1_IP"/23; then
+        if ping -c 1 $GATEWAY1_IP >/dev/null
+        then
+            INTERNAL1_IF=${INTERFACE[1]}
+            INTERNAL2_IF=${INTERFACE[2]}
+        else
+            INTERNAL1_IF=${INTERFACE[2]}
+            INTERNAL2_IF=${INTERFACE[1]}
+        fi
+    else
+	    echo "Unable to configure ${INTERFACE[1]}"
+	    local -i retval=1
+    fi
+    ip addr flush dev "$INTERNAL1_IF"
+    return $retval
+}
+
+# Check external network connectivity
+check_networking(){
+    if ping -c 3 8.8.8.8 >/dev/null; then
+        echo "Networking appears to be working correctly"
+        local -i retval=0
+    else
+        echo "ERROR: Networking is not working correctly"
+        local -i retval=1
+    fi
+    return $retval
+}
+
+# Check DNS resolution
+check_dns(){
+    if ping -c 3 google.com >/dev/null; then
+        echo "DNS appears to be working correctly"
+        local -i retval=0
+    else
+        echo "ERROR: DNS is not working correctly"
+        echo "Check /etc/resolv.conf and try ifdown/ifup br0/br1 interfaces"
+        local -i retval=1
+    fi
+    return $retval
+}
+
+generate_network_interfaces(){
+    cat >/etc/network/interfaces <<-EOF
+#These are generated by orange-box build scripts
+auto lo
+iface lo inet loopback
+
+auto ${INTERFACE[0]}
+iface ${INTERFACE[0]} inet manual
+
+auto $INTERNAL1_IF
+iface $INTERNAL1_IF inet manual
+
+auto $INTERNAL2_IF
+iface $INTERNAL2_IF inet manual
+
+auto br0
+iface br0 inet static
+    address $INTERNAL1_IP
+    netmask 255.255.254.0
+    gateway $GATEWAY1_IP
+    dns-nameservers $INTERNAL1_IP $GATEWAY1_IP
+    bridge_ports $INTERNAL1_IF
+    bridge_stp off
+    bridge_fd 0
+    bridge_maxwait 0
+
+auto br1
+iface br1 inet static
+    address $INTERNAL2_IP
+    netmask 255.255.254.0
+    bridge_ports $INTERNAL2_IF
+    bridge_stp off
+    bridge_fd 0
+    bridge_maxwait 0
+EOF
+}
+
+# Disable NetworkManager 
+disable_network_manager(){
+    systemctl stop NetworkManager >/dev/null 2>&1
+    systemctl disable NetworkManager >/dev/null 2>&1
+}
+
+# Restart all network interfaces
+restart_interfaces(){
+    for iface in ${INTERFACE[0]} $INTERNAL1_IF $INTERNAL2_IF; do
+        ifdown --force "$iface"
+    done
+
+    for iface in $INTERNAL1_IF $INTERNAL2_IF br0 br1; do
+	    ifup --force "$iface"
+    done
+}
+
+main(){
+
+    if ! check_for_root; then
+        echo "ERROR: This script must be run as root"
+        exit 1
+    fi
+
+    echo "Creating OrangeBox configuration file"
+    set_orange_box_config
+
+    echo "Checking required packages"
+    if ! install_bridge_packages; then
+        echo "Could not install bridge-utils packages"
+        exit 1
+    fi
+
+    create_interface_array
+
+    echo "Setting kernel parameters"
+    set_sysctls
+
+    # Sanity check that the OrangeBox number is correct before configuring networks
+    if ! check_orangebox_number "$OB_NUM"; then
+        echo "ERROR Your hostname should in the format of OrangeBox??: ex OrangeBox56"
+        exit 1
+    fi
+
+    echo "Checking VLAN configuration"
+    if ! check_interface_vlan; then
+        echo "ERROR Could not configure interfaces for initial tests"
+        exit 1
+    fi
+
+    echo "Disabling NetworkManager"
+    disable_network_manager
+
+    echo "Generating network interfaces file"
+    generate_network_interfaces	
+
+    echo "Restarting networking"
+    restart_interfaces
+
+    echo "Checking network function"
+    if ! check_networking; then
+        exit 1
+    fi
+
+    echo "Checking DNS resolution"
+    if ! check_dns; then
+	    exit 1
+    fi
+
+    exit 0
+
+}
+
+main "$@"

=== added file 'scripts/verify.sh'
--- scripts/verify.sh	1970-01-01 00:00:00 +0000
+++ scripts/verify.sh	2017-04-25 19:02:06 +0000
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+set -e
+set -u
+
+BIOS_PREFIX=MYBDWi5v.86A.
+USERNAME=ubuntu
+HOSTNAME_REGEX='OrangeBox[0-9][0-9]'
+
+source ob_profile.sh
+
+ERROR=
+log() {
+    type=$1
+    format=$2
+    shift 2
+    case $type in
+        error)
+            printf '\e[1;31mERROR:\e[0m   '
+            # shellcheck disable=SC2059
+            printf "${format}\n" "$@"
+            ERROR=1
+        ;;
+        warn)
+            printf '\e[1;33mWARNING:\e[0m '
+            # shellcheck disable=SC2059
+            printf "${format}\n" "$@"
+        ;;
+        info)
+            printf '\e[0;32mINFO:\e[0m    '
+            # shellcheck disable=SC2059
+            printf "${format}\n" "$@"
+        ;;
+        *)
+            echo 'log: unknown type specified.'
+            exit 1
+        ;;
+    esac
+}
+
+check_bios_revision() {
+    bios_version=$(sudo dmidecode -s bios-version | cut -d' ' -f2)
+    bios_revision=${bios_version#$BIOS_PREFIX}
+    bios_revision=${bios_revision%%.*}
+
+    if [ "$bios_revision" = "$TESTED_BIOS_REVISION" ]; then
+        log info 'You have the tested BIOS revision - %s' "$TESTED_BIOS_REVISION"
+    else
+        log warn 'The current tested BIOS revision is %s, but you have revision %s' "$TESTED_BIOS_REVISION" "$bios_revision"
+    fi
+}
+
+check_hostname() {
+    if echo "$HOSTNAME" | egrep -q "^${HOSTNAME_REGEX}$"; then
+        log info 'hostname is OK - %s' "$HOSTNAME"
+    else
+        log error 'hostname must meet the regex "%s"' "$HOSTNAME_REGEX"
+    fi
+}
+
+check_username() {
+    if [ "$USER" = "$USERNAME" ]; then
+        log info 'username is OK - %s' "$USERNAME"
+    else
+        log error 'username must be "%s"' "$USERNAME"
+    fi
+}
+
+# get sudo permission
+sudo true
+
+check_bios_revision
+check_hostname
+check_username
+
+if [ "$ERROR" = 1 ]; then
+    exit 1
+fi

=== added file 'template/archive.conf'
--- template/archive.conf	1970-01-01 00:00:00 +0000
+++ template/archive.conf	2017-04-25 19:02:06 +0000
@@ -0,0 +1,13 @@
+<VirtualHost *:80>
+	ServerName archive.ubuntu.com
+	ServerAdmin webmaster@localhost
+	DocumentRoot /srv/mirrors/archive.ubuntu.com/
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+	<Directory /srv/mirrors/archive.ubuntu.com/>
+	        Options Indexes FollowSymLinks Multiviews
+		Require all granted
+	</Directory>
+</VirtualHost>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

=== added file 'template/ubuntu-cloud.conf'
--- template/ubuntu-cloud.conf	1970-01-01 00:00:00 +0000
+++ template/ubuntu-cloud.conf	2017-04-25 19:02:06 +0000
@@ -0,0 +1,12 @@
+<VirtualHost *:80>
+	ServerName ubuntu-cloud.archive.canonical.com
+	ServerAdmin webmaster@localhost
+	DocumentRoot /srv/mirrors/ubuntu-cloud.archive.canonical.com/
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+	<Directory /srv/mirrors/ubuntu-cloud.archive.canonical.com/>
+	        Options Indexes FollowSymLinks Multiviews
+		Require all granted
+	</Directory>
+</VirtualHost>
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

=== removed file 'ubuntu-cloud.conf'
--- ubuntu-cloud.conf	2016-05-19 22:40:57 +0000
+++ ubuntu-cloud.conf	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<VirtualHost *:80>
-	ServerName ubuntu-cloud.archive.canonical.com
-	ServerAdmin webmaster@localhost
-	DocumentRoot /srv/mirrors/ubuntu-cloud.archive.canonical.com/
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
-	<Directory /srv/mirrors/ubuntu-cloud.archive.canonical.com/>
-	        Options Indexes FollowSymLinks Multiviews
-		Require all granted
-	</Directory>
-</VirtualHost>
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet