Merge ~cgrabowski/maas:composing_vm_in_cluster_specifies_cluster_member into maas:master

[Christian Grabowski]

clustered compose specifies target as current client

[MAAS Lander (maas-lander)]

UNIT TESTS
-b composing_vm_in_cluster_specifies_cluster_member lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: e56289ca5b6a48187b575fa7352d05b48bd051aa

review: Approve

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b composing_vm_in_cluster_specifies_cluster_member lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11251/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b composing_vm_in_cluster_specifies_cluster_member lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11253/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b composing_vm_in_cluster_specifies_cluster_member lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11255/console
COMMIT: 0dcf24e63267919a7c52143da88fbec90187c0b4

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b composing_vm_in_cluster_specifies_cluster_member lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11256/console
COMMIT: fc59dc50ba189f6cb6d784bee41f8a7d4e9b8a52

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b composing_vm_in_cluster_specifies_cluster_member lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 9b920059fb441c3ae4cd4e2968344203f095dd6a

review: Approve

diff --git a/src/provisioningserver/drivers/pod/lxd.py b/src/provisioningserver/drivers/pod/lxd.py
index 0b54702..ba53429 100644
--- a/src/provisioningserver/drivers/pod/lxd.py
+++ b/src/provisioningserver/drivers/pod/lxd.py
@@ -454,7 +454,15 @@ class LXDPodDriver(PodDriver):
             }
 
             # Create the machine.
-            machine = client.virtual_machines.create(definition, wait=True)
+            create_kwargs = {"wait": True}
+            if client.host_info["environment"]["server_clustered"]:
+                create_kwargs["target"] = client.host_info["environment"][
+                    "server_name"
+                ]
+
+            machine = client.virtual_machines.create(
+                definition, **create_kwargs
+            )
             # Pod hints are updated on the region after the machine is composed.
             discovered_machine = self._get_discovered_machine(
                 client, machine, storage_pools, request=request
diff --git a/src/provisioningserver/drivers/pod/tests/test_lxd.py b/src/provisioningserver/drivers/pod/tests/test_lxd.py
index 7704b94..0afd2ee 100644
--- a/src/provisioningserver/drivers/pod/tests/test_lxd.py
+++ b/src/provisioningserver/drivers/pod/tests/test_lxd.py
@@ -331,6 +331,65 @@ class TestClusteredLXDPodDriver(MAASTestCase):
             discovered_cluster.pod_addresses,
         )
 
+    @inlineCallbacks
+    def test_compose_specifies_target(self):
+        request = make_requested_machine()
+        self.fake_lxd.profiles.exists.return_value = True
+        mock_storage_pools = Mock()
+        self.fake_lxd.storage_pools.all.return_value = mock_storage_pools
+        mock_get_usable_storage_pool = self.patch(
+            self.driver, "_get_usable_storage_pool"
+        )
+        usable_pool = Mock()
+        usable_pool.name = factory.make_name("pool")
+        mock_get_usable_storage_pool.return_value = usable_pool
+        mock_machine = Mock()
+        self.fake_lxd.virtual_machines.create.return_value = mock_machine
+        mock_get_discovered_machine = self.patch(
+            self.driver, "_get_discovered_machine"
+        )
+        mock_get_discovered_machine.return_value = sentinel.discovered_machine
+        definition = {
+            "name": request.hostname,
+            "architecture": debian_to_kernel_architecture(
+                request.architecture
+            ),
+            "config": {
+                "limits.cpu": str(request.cores),
+                "limits.memory": str(request.memory * 1024 ** 2),
+                "limits.memory.hugepages": "false",
+                "security.secureboot": "false",
+            },
+            "profiles": ["maas"],
+            "source": {"type": "none"},
+            "devices": {
+                "root": {
+                    "path": "/",
+                    "type": "disk",
+                    "pool": usable_pool.name,
+                    "size": str(request.block_devices[0].size),
+                    "boot.priority": "0",
+                },
+                "eth0": {
+                    "name": "eth0",
+                    "type": "nic",
+                    "nictype": "bridged",
+                    "parent": "lxdbr0",
+                    "boot.priority": "1",
+                },
+            },
+        }
+
+        discovered_machine, empty_hints = yield self.driver.compose(
+            None, self.make_context(), request
+        )
+        self.fake_lxd.virtual_machines.create.assert_called_once_with(
+            definition,
+            wait=True,
+            target=self.fake_lxd.host_info["environment"]["server_name"],
+        )
+        self.fake_lxd.profiles.exists.assert_called_once_with("maas")
+
 
 class TestLXDPodDriver(MAASTestCase):