VMBuilder

Merge lp://staging/~huerlisi/vmbuilder/dev into lp://staging/vmbuilder

dev
Merge into 0.12

Proposed by Simon Huerlimann on 2010-05-05

Status:

Merged

Approved by:

Soren Hansen on 2010-06-15

Approved revision:

no longer in the source branch.

Merged at revision:

452

Proposed branch:

lp://staging/~huerlisi/vmbuilder/dev

Merge into:

lp://staging/vmbuilder

Diff against target:

132 lines (+30/-16)

4 files modified

VMBuilder/contrib/cli.py (+23/-13)
VMBuilder/disk.py (+1/-1)
VMBuilder/plugins/kvm/vm.py (+4/-0)
VMBuilder/plugins/ubuntu/distro.py (+2/-2)

To merge this branch:

bzr merge lp://staging/~huerlisi/vmbuilder/dev

Wishlist

Confirmed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Soren Hansen		2010-05-05	Approve on 2010-06-15
Review via email: mp+24724@code.staging.launchpad.net

Description of the change

Hi Soren

Here's my attempt at helping to make vmbuilder the simplest VM builder on Earth;-)

My branch contains the following changes:
* Some typo/language fixes
* Support for swapsize == 0, thereby fixing Launchpad bug #403149
* Support more than one raw devices, including support for partition files

Currently mostly doing coding using Ruby/Git/Github, this is my first attempt at Python/Bzr/Launchpad. I would appreciate any hint (create topic branches for bug fixes, use XXX commenting style...) on how to do vmbuilder development which fits into your workflow.

Thanx for all the good stuff and kind regards
Simon Hürlimann

lp://staging/~huerlisi/vmbuilder/dev updated on 2010-06-15

439. By Soren Hansen on 2010-05-07: Make install_file work in non-context plugins.
440. By Soren Hansen on 2010-05-07: Revive firstscripts plugins. This fixes the --firstboot and --firstlogin
options, both of which went missing with 0.12.
441. By Soren Hansen on 2010-05-07: Replace "-p" argument to blkid with "-c /dev/null". According to the docs, they should be equivalent, but in some versions of blkid, -s is not properly applied when using -p. Thanks to Danilo Šegan (Данило Шеган) for the patch.
442. By Soren Hansen on 2010-05-11: Update my (Soren's) e-mail address.
443. By Soren Hansen on 2010-05-18: Add QEMu as a target Hypervisor. It acts exactly the same as KVM, but
the libvirt plugin makes sure it runs through qemu rather than kvm. This
is useful for non-VT-capable hosts.
444. By Soren Hansen on 2010-05-18: Prepare for 0.12.4 release.
445. By Soren Hansen on 2010-05-29: Fall back to a C locale if no LANG environment is set.
446. By Soren Hansen on 2010-05-29: Move get_locale out of Ubuntu class and add unit tests for it.
447. By Soren Hansen on 2010-06-15: Merge lp:~danilo/vmbuilder/bug-536940
448. By Soren Hansen on 2010-06-15: Add Maverick as a valid Ubuntu series.
449. By Soren Hansen on 2010-06-15: Dont' attempt to locale-gen a C locale. That's silly.
450. By Soren Hansen on 2010-06-15: Merge lp:~lfaraone/vmbuilder/lp580237

Revision history for this message

Soren Hansen (soren) wrote on 2010-06-15:

On Wed, May 05, 2010 at 06:32:29AM -0000, Simon Huerlimann wrote:
> Simon Huerlimann has proposed merging lp:~huerlisi/vmbuilder/dev into lp:vmbuilder.

Thank you! Please accept my apologies for the delay. I'll try to respond
in a more timely fashion in the future.

> @@ -234,29 +238,35 @@
> try:
> curdisk = list()
> size = 0
> + count = 0
> for line in file(self.options.part):
> pair = line.strip().split(' ',1)
[...]
> + def do_disk(self, hypervisor, curdisk, size, count):
> default_filesystem = hypervisor.distro.preferred_filesystem()
> - disk = hypervisor.add_disk(util.tmpfile(keep=False), size+1)
> - logging.debug("do_disk - size: %d" % size)
> + if self.options.raw:
> + disk = hypervisor.add_disk(filename=self.options.raw[count])

I took the liberty of renaming "count" to "disk_idx" for clarity.

Other than that, it looks great.

review approve
merge approved

--
Soren Hansen
Ubuntu Developer
http://www.ubuntu.com/

review: Approve

lp://staging/~huerlisi/vmbuilder/dev updated on 2010-06-15

451. By Soren Hansen on 2010-06-15: Add an .overwrite attribute to Context objects, defaulting to False.
Set it according to the --overwrite option in the CLI.
Fix a 0.11ism in libvirt plugin.
452. By Soren Hansen on 2010-06-15: Merge lp:~huerlisi/vmbuilder/dev