From 1056bfc25bd0e820ba4017c4fc0b3cba98d36a27 Mon Sep 17 00:00:00 2001 From: David Shea Date: Fri, 28 Sep 2018 15:22:54 -0400 Subject: [PATCH] Add a vmdk compose type. This is similar to the AMI type, but also adds open-vm-tools and does not do anything special to the partitioning --- docs/composer-cli.rst | 2 +- share/composer/vmdk.ks | 44 ++++++++++++++++++++++++++++++++++++ src/pylorax/api/compose.py | 22 ++++++++++++++++++ tests/pylorax/test_server.py | 2 +- 4 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 share/composer/vmdk.ks diff --git a/docs/composer-cli.rst b/docs/composer-cli.rst index fd92c48d..78d09eaf 100644 --- a/docs/composer-cli.rst +++ b/docs/composer-cli.rst @@ -41,7 +41,7 @@ keep track of the build. You can also cancel the build if needed. The available types of images is displayed by ``composer compose types``. Currently this consists of: ami, ext4-filesystem, live-iso, partitioned-disk, -qcow2, tar, vhd +qcow2, tar, vhd, vmdk Monitor the build status ------------------------ diff --git a/share/composer/vmdk.ks b/share/composer/vmdk.ks new file mode 100644 index 00000000..3cab6d50 --- /dev/null +++ b/share/composer/vmdk.ks @@ -0,0 +1,44 @@ +# Lorax Composer vmdk kickstart template + +# Firewall configuration +firewall --enabled + +# Root password +rootpw --plaintext removethispw +# Network information +network --bootproto=dhcp --onboot=on --activate +# System authorization information +auth --useshadow --enablemd5 +# System keyboard +keyboard --xlayouts=us --vckeymap=us +# System language +lang en_US.UTF-8 +# SELinux configuration +selinux --enforcing +# Installation logging level +logging --level=info +# Shutdown after installation +shutdown +# System timezone +timezone US/Eastern +# System bootloader configuration +bootloader --location=mbr + +# Basic services +services --enabled=sshd,chronyd,vmtoolsd + +%post +# Remove random-seed +rm /var/lib/systemd/random-seed +%end + +%packages +kernel +-dracut-config-rescue + +grub2 + +chrony +open-vm-tools + +# NOTE lorax-composer will add the recipe packages below here, including the final %end diff --git a/src/pylorax/api/compose.py b/src/pylorax/api/compose.py index 49912ae1..7319985b 100644 --- a/src/pylorax/api/compose.py +++ b/src/pylorax/api/compose.py @@ -559,6 +559,28 @@ def compose_args(compose_type): "app_template": None, "app_file": None, }, + "vmdk": {"make_iso": False, + "make_disk": True, + "make_fsimage": False, + "make_appliance": False, + "make_ami": False, + "make_tar": False, + "make_pxe_live": False, + "make_ostree_live": False, + "make_oci": False, + "make_vagrant": False, + "ostree": False, + "live_rootfs_keep_size": False, + "live_rootfs_size": 0, + "image_type": "vmdk", + "qemu_args": [], + "image_name": "disk.vmdk", + "fs_label": "", + "image_only": True, + "app_name": None, + "app_template": None, + "app_file": None, + }, } return _MAP[compose_type] diff --git a/tests/pylorax/test_server.py b/tests/pylorax/test_server.py index 9a91d2ce..d9115a53 100644 --- a/tests/pylorax/test_server.py +++ b/tests/pylorax/test_server.py @@ -810,7 +810,7 @@ class ServerTestCase(unittest.TestCase): data = json.loads(resp.data) self.assertNotEqual(data, None) self.assertEqual(data["status"], False, "Failed to fail to start test compose: %s" % data) - self.assertEqual(data["errors"], [{"id": BAD_COMPOSE_TYPE, "msg": "Invalid compose type (snakes), must be one of ['ami', 'ext4-filesystem', 'live-iso', 'partitioned-disk', 'qcow2', 'tar', 'vhd']"}], + self.assertEqual(data["errors"], [{"id": BAD_COMPOSE_TYPE, "msg": "Invalid compose type (snakes), must be one of ['ami', 'ext4-filesystem', 'live-iso', 'partitioned-disk', 'qcow2', 'tar', 'vhd', 'vmdk']"}], "Failed to get errors: %s" % data) def test_compose_03_status_fail(self):