Orange Box

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

  1. orange-box-lp1376292-lp1376279-minor-updates
  2. Merge into trunk
Proposed by Darryl Weaver
Status: Merged
Merged at revision: 489
Proposed branch: lp:~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates
Merge into: lp:orange-box
Diff against target: 94 lines (+25/-11)
4 files modified
debian/postinst (+3/-2)
usr/bin/orange-box-demo-cleanup (+3/-2)
usr/bin/orange-box-sync-charmstore (+17/-5)
usr/lib/orange-box/patches/acquire_languages_none.patch (+2/-2)
To merge this branch: bzr merge lp:~dweaver/orange-box/orange-box-lp1376292-lp1376279-minor-updates
Reviewer Review Type Date Requested Status
Dustin Kirkland  Pending
Review via email: mp+236762@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Nicolas Thomas (thomnico) wrote :

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

Revision history for this message
Darryl Weaver (dweaver) wrote :

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

Revision history for this message
Dustin Kirkland  (kirkland) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
158 maas-server: 'http://10.14.4.1/MAAS/'158 maas-server: 'http://10.14.4.1/MAAS/'
159 maas-oauth: '$APIKEY'159 maas-oauth: '$APIKEY'
160 default-series: trusty160 default-series: trusty
161 enable-os-upgrade: false161 #Enable below after juju 1.21 is released as stable
162 #enable-os-upgrade: false
162 authorized-keys-path: /home/ubuntu/.ssh/id_rsa.pub163 authorized-keys-path: /home/ubuntu/.ssh/id_rsa.pub
163 admin-secret: 'admin'164 admin-secret: 'admin'
164 logging-config: '<root>=DEBUG'165 logging-config: '<root>=DEBUG'
@@ -166,7 +167,7 @@
166 rm -rf /home/ubuntu/.juju-plugins167 rm -rf /home/ubuntu/.juju-plugins
167 git clone https://github.com/juju/plugins /home/ubuntu/.juju-plugins168 git clone https://github.com/juju/plugins /home/ubuntu/.juju-plugins
168 sudo chown -R ubuntu:ubuntu /home/ubuntu/169 sudo chown -R ubuntu:ubuntu /home/ubuntu/
169 echo "PATH=\$PATH:/home/ubuntu/.juju-plugins" >> /home/ubuntu/.bashrc170 echo "PATH=\$PATH:/home/ubuntu/.juju-plugins:/home/ubuntu/examples/bin" >> /home/ubuntu/.bashrc
170 #Required for local charm deployments to work.171 #Required for local charm deployments to work.
171 sed -i -e '/^export JUJU_REPOSITORY=/d' /home/ubuntu/.bashrc172 sed -i -e '/^export JUJU_REPOSITORY=/d' /home/ubuntu/.bashrc
172 echo "export JUJU_REPOSITORY=/srv/charmstore" >> /home/ubuntu/.bashrc173 echo "export JUJU_REPOSITORY=/srv/charmstore" >> /home/ubuntu/.bashrc
173174
=== 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 @@
1#!/bin/bash1#!/bin/bash
2#2#
3# orange-box-destroy-juju3# orange-box-demo-cleanup
4# Copyright (C) 2014 Canonical Ltd.4# Copyright (C) 2014 Canonical Ltd.
5#5#
6# Authors: Darryl Weaver <darryl.weaver@canonical.com>6# Authors: Darryl Weaver <darryl.weaver@canonical.com>
@@ -20,8 +20,9 @@
2020
21ENVIRONMENT=`juju env`21ENVIRONMENT=`juju env`
2222
23#Destroy everything23#Destroy juju environment
24juju destroy-environment $ENVIRONMENT24juju destroy-environment $ENVIRONMENT
25#make sure AMTs are all powered off
25export AMT_PASSWORD=Password1+26export AMT_PASSWORD=Password1+
26for i in $(seq 11 19); do27for i in $(seq 11 19); do
27 yes | amttool 10.14.4.$i powerdown >/dev/null 2>&128 yes | amttool 10.14.4.$i powerdown >/dev/null 2>&1
2829
=== 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 @@
31mkdir -p /srv/charmstore/snapshot-$DATE31mkdir -p /srv/charmstore/snapshot-$DATE
3232
33echo Mirroring the Charmstore ...33echo Mirroring the Charmstore ...
34cd /srv/charmstore/34cd /srv/charmstore/snapshot-$DATE
35run-one charm getall snapshot-$DATE 2>/dev/null35sudo -i run-one charm getall /srv/charmstore/snapshot-$DATE 2>/dev/null
36#check some base charms are there:
37if [ ! -d juju-gui ]; then
38 echo "Juju-gui charm is missing - exiting"
39 exit
40elif [ ! -d nova-cloud-controller ]; then
41 echo "nova-cloud-controller charm is missing - exiting"
42 exit
43elif [ ! -d mongodb ]; then
44 echo "mongodb charm is missing - exiting"
45 exit
46fi
47
36#Branch the Landscape charm - required for Landscape demo to minimise network dependencies48#Branch the Landscape charm - required for Landscape demo to minimise network dependencies
37cd snapshot-$DATE49sudo -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)
38bzr branch lp:~landscape/landscape-charm/stable landscape >/dev/null 2>&1 || (cd landscape && bzr pull >/dev/null 2>&1)
39#Branch the cinder-ceph charm - required for openstack50#Branch the cinder-ceph charm - required for openstack
40bzr branch lp:charms/cinder-ceph >/dev/null 2>&1 || (cd cinder-ceph && bzr pull >/dev/null 2>&1)51sudo -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)
52
41#Link directories for service aliases53#Link directories for service aliases
42ln -s quantum-gateway neutron-gateway54ln -s quantum-gateway neutron-gateway
43ln -s rabbitmq-server rabbitmq55ln -s rabbitmq-server rabbitmq
4456
=== 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 @@
1--- /etc/mass/preseeds/curtin_userdata 2014-09-23 21:18:30 +00001--- /etc/maas/preseeds/curtin_userdata 2014-09-23 21:18:30 +0000
2+++ /etc/mass/preseeds/curtin_userdata 2014-10-01 11:41:06 +00002+++ /etc/maas/preseeds/curtin_userdata 2014-10-01 11:41:06 +0000
3@@ -14,6 +14,7 @@3@@ -14,6 +14,7 @@
4 driver_04_load: ["sh", "-c", "depmod && modprobe {{driver['module']}}"]4 driver_04_load: ["sh", "-c", "depmod && modprobe {{driver['module']}}"]
5 {{endif}}5 {{endif}}

Subscribers

People subscribed via source and target branches