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

(cherry picked from commit 1056bfc25b)

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-cli compose types``.
 Currently this consists of: ami, ext4-filesystem, live-iso, partitioned-disk,
-qcow2, tar, vhd
+qcow2, tar, vhd, vmdk
 
 Monitor the build status
 ------------------------

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

src/pylorax/api/compose.py

@@ -562,6 +562,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]
 

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):