Merge ~mpontillo/maas:kvm-deploy-arm64--bug-1794560 into maas:master

[Mike Pontillo]

LP: #1794560 - Include qemu-efi package for AMD64 KVM pod deployments.

[Newell Jensen (newell-jensen)]

+1

review: Approve

diff --git a/src/metadataserver/tests/test_vendor_data.py b/src/metadataserver/tests/test_vendor_data.py
index 3b1a6d3..341717a 100644
--- a/src/metadataserver/tests/test_vendor_data.py
+++ b/src/metadataserver/tests/test_vendor_data.py
@@ -242,3 +242,11 @@ class TestGenerateRackControllerConfiguration(MAASServerTestCase):
         virsh_password_meta = NodeMetadata.objects.filter(
             node=node, key="virsh_password").first()
         self.assertThat(virsh_password_meta.value, HasLength(32))
+
+    def test_includes_qemu_efi_for_install_kvm_on_amd64(self):
+        node = factory.make_Node(
+            osystem='ubuntu', netboot=False, architecture='amd64/generic')
+        node.install_kvm = True
+        configuration = get_vendor_data(node)
+        config = dict(configuration)
+        self.assertThat(config['packages'], Contains("qemu-efi"))
diff --git a/src/metadataserver/vendor_data.py b/src/metadataserver/vendor_data.py
index b6bbf72..a7d942e 100644
--- a/src/metadataserver/vendor_data.py
+++ b/src/metadataserver/vendor_data.py
@@ -149,5 +149,11 @@ def generate_kvm_pod_configuration(node):
                 'shell': '/bin/rbash',
             }
         ]
-        # XXX: Use correct packages based on architecture.
-        yield "packages", ["qemu-kvm", "libvirt-bin"]
+        packages = ["qemu-kvm", "libvirt-bin"]
+        if node.architecture is not None:
+            architecture = node.architecture
+            if '/' in architecture:
+                architecture = architecture.split('/')[0]
+            if architecture == 'amd64':
+                packages.append('qemu-efi')
+        yield "packages", packages