Add "real" Vagrant format options to image building.

We originally added Vagrant support by tweaking options sent
to the existing RHEV-M and vSphere OVA generation code.  This was
a bit of a hack and resulted in confusing filenames.

This adds "vagrant-libvirt" and "vagrant-virtualbox" image types,
passes in the correct options to Image Factory and produces output
files with the conventional ".box" extension and more descriptive
and less confusing vagrant name suffixes.
This commit is contained in:
Ian McLeod 2015-04-08 22:37:16 -05:00 committed by Dennis Gilmore
parent a80ab75b32
commit 52a01883d6
3 changed files with 21 additions and 2 deletions

View file

@ -5243,7 +5243,7 @@ def _build_image_indirection(options, task_opts, session, args):
def handle_image_build(options, session, args):
"""Create a disk image given an install tree"""
formats = ('vmdk', 'qcow', 'qcow2', 'vdi', 'rhevm-ova', 'vsphere-ova',
'docker', 'raw-xz')
'vagrant-virtualbox', 'vagrant-libvirt', 'docker', 'raw-xz')
usage = _("usage: %prog image-build [options] <name> <version> " +
"<target> <install-tree-url> <arch> [<arch>...]")
usage += _("\n %prog image-build --config FILE")