Merge lp:~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates into lp:orange-box

[Darryl Weaver]

Fix for bug #1376279.
Fix for bug #1376292.
Renamed orange-box-destroy-juju to orange-box-demo-cleanup.
Provided a link for backwards compatibility.
Added /home/ubuntu/examples/bin/ to default PATH.

[Nicolas Thomas (thomnico)]

Dweaver did you change the Example branch ??

shouldn't this:
   echo "PATH=\$PATH:/home/ubuntu/.juju-plugins:/home/ubuntu/examples/bin"
be:
 echo "PATH=\$PATH:/home/ubuntu/.juju-plugins:/home/ubuntu/Examples/bin"

On Wed, Oct 1, 2014 at 8:51 PM, <email address hidden> wrote:
> The proposal to merge lp:~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates into lp:orange-box has been updated.
>
> Status: Needs review => Merged
>
> For more details, see:
> https://code.launchpad.net/~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates/+merge/236762
> --
> https://code.launchpad.net/~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates/+merge/236762
> You are subscribed to branch lp:orange-box.

--
Best Regards,
       Nicolas Thomas
http://insights.ubuntu.com/?p=889
EMEA Solution Architect Canonical
GPG FPR: D592 4185 F099 9031 6590 6292 492F C740 F03A 7EB9

[Darryl Weaver (dweaver)]

Ah, yes it should have been with a capital E for Examples.

[Dustin Kirkland  (kirkland)]

Fixed in r493.

Dustin Kirkland
Canonical, Ltd.

On Wed, Oct 1, 2014 at 7:09 PM, Darryl Weaver
<email address hidden> wrote:
> Ah, yes it should have been with a capital E for Examples.
> --
> https://code.launchpad.net/~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates/+merge/236762
> You are requested to review the proposed merge of lp:~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates into lp:orange-box.

=== modified file 'debian/postinst'
--- debian/postinst	2014-10-01 11:44:43 +0000
+++ debian/postinst	2014-10-01 17:55:29 +0000
@@ -158,7 +158,8 @@
         maas-server: 'http://10.14.4.1/MAAS/'
         maas-oauth: '$APIKEY'
         default-series: trusty
-	enable-os-upgrade: false
+	#Enable below after juju 1.21 is released as stable
+        #enable-os-upgrade: false
         authorized-keys-path: /home/ubuntu/.ssh/id_rsa.pub
         admin-secret: 'admin'
         logging-config: '<root>=DEBUG'
@@ -166,7 +167,7 @@
 	rm -rf /home/ubuntu/.juju-plugins
 	git clone https://github.com/juju/plugins /home/ubuntu/.juju-plugins
 	sudo chown -R ubuntu:ubuntu /home/ubuntu/
-	echo "PATH=\$PATH:/home/ubuntu/.juju-plugins" >> /home/ubuntu/.bashrc
+	echo "PATH=\$PATH:/home/ubuntu/.juju-plugins:/home/ubuntu/examples/bin" >> /home/ubuntu/.bashrc
 	#Required for local charm deployments to work.
 	sed -i -e '/^export JUJU_REPOSITORY=/d' /home/ubuntu/.bashrc
 	echo "export JUJU_REPOSITORY=/srv/charmstore" >> /home/ubuntu/.bashrc

=== renamed file 'usr/bin/orange-box-destroy-juju' => 'usr/bin/orange-box-demo-cleanup'
--- usr/bin/orange-box-destroy-juju	2014-07-30 18:28:42 +0000
+++ usr/bin/orange-box-demo-cleanup	2014-10-01 17:55:29 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#    orange-box-destroy-juju
+#    orange-box-demo-cleanup
 #    Copyright (C) 2014 Canonical Ltd.
 #
 #    Authors: Darryl Weaver <[e-mail]>
@@ -20,8 +20,9 @@
 
 ENVIRONMENT=`juju env`
 
-#Destroy everything
+#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

=== added symlink 'usr/bin/orange-box-destroy-juju'
=== target is u'orange-box-demo-cleanup'
=== modified file 'usr/bin/orange-box-sync-charmstore'
--- usr/bin/orange-box-sync-charmstore	2014-08-22 22:11:37 +0000
+++ usr/bin/orange-box-sync-charmstore	2014-10-01 17:55:29 +0000
@@ -31,13 +31,25 @@
 mkdir -p /srv/charmstore/snapshot-$DATE
 
 echo Mirroring the Charmstore ...
-cd /srv/charmstore/
-run-one charm getall snapshot-$DATE 2>/dev/null
+cd /srv/charmstore/snapshot-$DATE
+sudo -i run-one charm getall /srv/charmstore/snapshot-$DATE 2>/dev/null
+#check some base charms are there:
+if [ ! -d juju-gui ]; then
+        echo "Juju-gui charm is missing - exiting"
+        exit
+elif [ ! -d nova-cloud-controller ]; then
+        echo "nova-cloud-controller charm is missing - exiting"
+        exit
+elif [ ! -d mongodb ]; then
+        echo "mongodb charm is missing - exiting"
+        exit
+fi
+
 #Branch the Landscape charm - required for Landscape demo to minimise network dependencies
-cd snapshot-$DATE
-bzr branch lp:~landscape/landscape-charm/stable landscape >/dev/null 2>&1 || (cd landscape && bzr pull >/dev/null 2>&1)
+sudo -i bzr branch lp:~landscape/landscape-charm/stable /srv/charmstore/snapshot-$DATE/landscape >/dev/null 2>&1 || (cd /srv/charmstore/snapshot-$DATE/landscape && bzr pull >/dev/null 2>&1)
 #Branch the cinder-ceph charm - required for openstack
-bzr branch lp:charms/cinder-ceph  >/dev/null 2>&1 || (cd cinder-ceph && bzr pull >/dev/null 2>&1)
+sudo -i bzr branch lp:charms/cinder-ceph /srv/charmstore/snapshot-$DATE/cinder-ceph >/dev/null 2>&1 || (cd /srv/charmstore/snapshot-$DATE/cinder-ceph && bzr pull >/dev/null 2>&1)
+
 #Link directories for service aliases
 ln -s quantum-gateway neutron-gateway
 ln -s rabbitmq-server rabbitmq

=== modified file 'usr/lib/orange-box/patches/acquire_languages_none.patch'
--- usr/lib/orange-box/patches/acquire_languages_none.patch	2014-10-01 11:44:43 +0000
+++ usr/lib/orange-box/patches/acquire_languages_none.patch	2014-10-01 17:55:29 +0000
@@ -1,5 +1,5 @@
---- /etc/mass/preseeds/curtin_userdata	2014-09-23 21:18:30 +0000
-+++ /etc/mass/preseeds/curtin_userdata	2014-10-01 11:41:06 +0000
+--- /etc/maas/preseeds/curtin_userdata	2014-09-23 21:18:30 +0000
++++ /etc/maas/preseeds/curtin_userdata	2014-10-01 11:41:06 +0000
 @@ -14,6 +14,7 @@
    driver_04_load: ["sh", "-c", "depmod && modprobe {{driver['module']}}"]
  {{endif}}