Changes

Author: domendobnikar

plugins/module_utils/vm.py

@@ -11,6 +11,7 @@
 
 __metaclass__ = type
 
+import yaml
 import base64
 from time import sleep
 from time import time
@@ -423,6 +424,24 @@ def create_export_or_import_vm_payload(ansible_dict, cloud_init, is_export):
             payload["template"]["cloudInitData"] = cloud_init
         return payload
 
+    def clone_add_user_data_to_cloud_init(cloud_init):
+        # Task 370 -  the generated cloud-init should include a runcmd to fix the grub UUID issue at first boot
+        if not cloud_init.get("user_data"):
+            return cloud_init
+
+        config = yaml.safe_load(cloud_init["user_data"]) or {}
+
+        runcmd = config.setdefault("runcmd", [])
+        runcmd.extend(
+            [
+                "sed -i 's/^GRUB_DISABLE_LINUX_UUID=true/#GRUB_DISABLE_LINUX_UUID=true/' /etc/default/grub",
+                "update-grub",
+            ]
+        )
+        # Keeps the header, safe_dump removes it
+        cloud_init["user_data"] = "#cloud-config\n" + yaml.safe_dump(config)
+        return cloud_init
+
     @classmethod
     def create_clone_vm_payload(
         cls,
@@ -446,6 +465,7 @@ def create_clone_vm_payload(
                     hypercore_tags.append(tag)
             data["template"]["tags"] = ",".join(hypercore_tags)
         if cloud_init:
+            cloud_init = clone_add_user_data_to_cloud_init(cloud_init)
             data["template"]["cloudInitData"] = cloud_init
         if preserve_mac_address:
             data["template"]["netDevs"] = [
@@ -612,7 +632,10 @@ def find_disk(self, slot):
 
     # primary disk is the largest Virtio disk
     def get_primary_disk(self):
-        return max(self.disk_list, key=lambda disk: disk.size)
+        virtio_disks = [disk for disk in self.disk_list if disk.disk_type == "virtio_disk"]
+        if not virtio_disks:
+            return None
+        return max(virtio_disks, key=lambda disk: disk.size)
 
     def post_vm_payload(self, rest_client, ansible_dict):
         # The rest of the keys from VM_PAYLOAD_KEYS will get set properly automatically

plugins/modules/vm_clone.py

@@ -167,10 +167,13 @@ def run(module, rest_client):
     task_status = TaskTag.get_task_status(rest_client, task)
     if task_status and task_status.get("state", "") == "COMPLETE":
         # Get cloned VM
-        virtual_machine_cloned_obj = VM.get_or_fail(query={"name": module.params["vm_name"]}, rest_client=rest_client)
+        virtual_machine_cloned_obj = VM.get_or_fail(query={"name": module.params["vm_name"]}, rest_client=rest_client)[
+            0
+        ]
         # Set boot devices after cloning Issue-370 (VM starts failing as soon as another disk is attahed if boot is not specified)
         # By default we always set the largest Virtio disk which is the "primary disk"
-        boot_items = [virtual_machine_cloned_obj.get_primary_disk.uuid]
+        primary_disk = virtual_machine_cloned_obj.get_primary_disk()
+        boot_items = [primary_disk.uuid] if primary_disk else []
         # previous boot order after cloning is always empty
         previous_boot_order = []
         changed = virtual_machine_cloned_obj.set_boot_devices(boot_items, module, rest_client, previous_boot_order)
@@ -209,14 +212,7 @@ def main():
                 type="dict",
                 default={},
                 options=dict(
-                    user_data=dict(
-                        type="str",
-                        default=(
-                            "runcmd:\n"
-                            "  - sed -i 's/^GRUB_DISABLE_LINUX_UUID=true/#GRUB_DISABLE_LINUX_UUID=true/' /etc/default/grub\n"
-                            "  - update-grub\n"
-                        ),
-                    ),
+                    user_data=dict(type="str"),
                     meta_data=dict(type="str"),
                 ),
             ),