Merge lp:~dpb/orange-box/extra-disk-vm into lp:orange-box

[David Britton]

Add an extra disk (2G) to the vms created by the add-virtual-nodes script

[Adam Collard (adam-collard)]

Looks good!

review: Approve

[David Britton (dpb)]

Adam, thanks. Can you merge this in for me?

On Wed, Aug 27, 2014 at 10:41 AM, Adam Collard <email address hidden>
wrote:

> Review: Approve
>
> Looks good!
> --
>
> https://code.launchpad.net/~davidpbritton/orange-box/extra-disk-vm/+merge/232448
> You are the owner of lp:~davidpbritton/orange-box/extra-disk-vm.
>

--
David Britton <email address hidden>

[Adam Collard (adam-collard)]

> Adam, thanks. Can you merge this in for me?

I'd love to. Unfortunately only Dustin (https://launchpad.net/~kirkland) can land branches at the moment.

Dustin - what needs to happen for me to be given rights on lp:orangebox ?

[Dustin Kirkland  (kirkland)]

I'll test this, commit and release later today. Thanks!

Dustin Kirkland
Canonical, Ltd.

On Wed, Aug 27, 2014 at 12:01 PM, Adam Collard
<email address hidden> wrote:
>> Adam, thanks. Can you merge this in for me?
>
> I'd love to. Unfortunately only Dustin (https://launchpad.net/~kirkland) can land branches at the moment.
>
> Dustin - what needs to happen for me to be given rights on lp:orangebox ?
> --
> https://code.launchpad.net/~davidpbritton/orange-box/extra-disk-vm/+merge/232448
> You are subscribed to branch lp:orange-box.

=== modified file 'usr/bin/orange-box-add-virtual-nodes'
--- usr/bin/orange-box-add-virtual-nodes	2014-07-25 19:16:24 +0000
+++ usr/bin/orange-box-add-virtual-nodes	2014-08-27 16:38:20 +0000
@@ -45,7 +45,7 @@
 	virsh destroy $hostname || true
 	virsh undefine $hostname || true
 	echo "INFO: Installing virtual machine"
-	virt-install --debug --name $hostname --ram 4096 --disk=path=/var/lib/orange-box/${hostname}.img,size=20 --vcpus=2 --os-type=linux --pxe --network=bridge=br0 --network=bridge=br0 --boot network || true
+	virt-install --debug --name $hostname --ram 4096 --disk=path=/var/lib/orange-box/${hostname}.img,size=20 --disk=path=/var/lib/orange-box/${hostname}-2.img,size=2 --vcpus=2 --os-type=linux --pxe --network=bridge=br0 --network=bridge=br0 --boot network || true
 	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")')