Merge lp:~secroft/obinstall/obinstall-fixes into lp:obinstall/next

[Scott Croft]

The wsman commands used to configure the amt ports on the nodes for vnc were removed into a separate script named amt_vnc_config.sh. This script will allow you to configure all of the nodes, i.e. a new OrangeBox, or a single node, in the event that a node was replaced.

The 05-add_physical_nodes.sh was changed after removing the wsman commands to move the power configuration of the noded into the create line and the update and commission lines were removed as the update is not needed and the commissioning of the nodes will automatically happen during a machine creation

[Craig Bender (craig-bender)]

Sorry for the delay, missed this one!

review: Approve

[Akash Chandrashekar (achandrashekar)]

review: Approve

=== modified file '05-add_physical_nodes.sh'
--- 05-add_physical_nodes.sh	2016-09-20 09:23:07 +0000
+++ 05-add_physical_nodes.sh	2016-12-07 18:00:20 +0000
@@ -60,21 +60,7 @@
 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 mac_addresses=${mac} hostname=node${nodenum}ob${ob_number}
-system_id=$(maas admin nodes read mac_address=$mac | grep system_id | cut -d'"' -f4)
-maas admin machine update $system_id power_parameters_power_address=172.27.${ob_number}.${amtnum} power_parameters_power_pass=Password1+
-maas admin machine commission $system_id 
-
-# 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
+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

=== added file 'amt_vnc_config.sh'
--- amt_vnc_config.sh	1970-01-01 00:00:00 +0000
+++ amt_vnc_config.sh	2016-12-07 18:00:20 +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