Merge lp:~dweaver/orange-box/orange-box-bootstrap-to-node0vm0 into lp:orange-box

[Darryl Weaver]

Modified orange-box-bootstrap-juju to default to node0vm0.maas by name.
Modified orange-box-demo-cleanup to detect MAAS < 1.6 and only then power down AMTs, otherwise let the juju destroy-environment and MAAS handle powering down AMTs.

=== modified file 'usr/bin/orange-box-bootstrap-juju'
--- usr/bin/orange-box-bootstrap-juju	2014-09-30 21:29:11 +0000
+++ usr/bin/orange-box-bootstrap-juju	2014-10-23 22:24:20 +0000
@@ -25,7 +25,7 @@
 }
 
 juju status && echo "Existing deployment found, exiting." && exit 0
-juju bootstrap --constraints "tags=virtual" --show-log
+juju bootstrap --to node0vm0.maas --show-log
 juju set-constraints "tags="
 juju deploy --to 0 --repository=/srv/charmstore/ local:trusty/juju-gui
 juju expose juju-gui

=== modified file 'usr/bin/orange-box-demo-cleanup'
--- usr/bin/orange-box-demo-cleanup	2014-10-01 17:42:22 +0000
+++ usr/bin/orange-box-demo-cleanup	2014-10-23 22:24:20 +0000
@@ -23,7 +23,10 @@
 #Destroy juju environment
 juju destroy-environment $ENVIRONMENT
 #make sure AMTs are all powered off
-export AMT_PASSWORD=Password1+
-for i in $(seq 11 19); do
-        yes | amttool 10.14.4.$i powerdown >/dev/null 2>&1
-done
+maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
+if dpkg --compare-versions $maas_ver lt 1.6; then
+	export AMT_PASSWORD=Password1+
+	for i in $(seq 11 19); do
+        	yes | amttool 10.14.4.$i powerdown >/dev/null 2>&1
+	done
+fi