Merge ~ack/maas:1988759-vmhost-deploy-3.2 into maas:3.2

[Alberto Donato]

LP:1988759 don't restrict LXD credentials to the maas project on LXD deploy

This causes MAAS not to be able to read storage volumes and networks from LXD

(backport of 95c09efaf)

[Alberto Donato (ack)]

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 1988759-vmhost-deploy-3.2 lp:~ack/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1039/consoleText
COMMIT: a0449358cfa6dd7e6772f26a6e9cfe0b377ccbdc

review: Needs Fixing

diff --git a/src/metadataserver/tests/test_vendor_data.py b/src/metadataserver/tests/test_vendor_data.py
index 74aed9e..54e3fd7 100644
--- a/src/metadataserver/tests/test_vendor_data.py
+++ b/src/metadataserver/tests/test_vendor_data.py
@@ -450,7 +450,7 @@ class TestGenerateKVMPodConfiguration(MAASServerTestCase):
                         "lxd init --auto --network-address=[::]",
                         "lxc project create maas",
                         "sh -c 'lxc project edit maas </root/maas-project.yaml'",
-                        "lxc config trust add /root/lxd.crt --restricted --projects maas",
+                        "lxc config trust add /root/lxd.crt",
                         "rm /root/lxd.crt /root/maas-project.yaml",
                     ],
                 ),
diff --git a/src/metadataserver/vendor_data.py b/src/metadataserver/vendor_data.py
index 1e69157..60b27f5 100644
--- a/src/metadataserver/vendor_data.py
+++ b/src/metadataserver/vendor_data.py
@@ -232,7 +232,7 @@ def generate_kvm_pod_configuration(node):
             "lxd init --auto --network-address=[::]",
             f"lxc project create {maas_project}",
             f"sh -c 'lxc project edit {maas_project} <{project_conf_file}'",
-            f"lxc config trust add {cert_file} --restricted --projects {maas_project}",
+            f"lxc config trust add {cert_file}",
             f"rm {cert_file} {project_conf_file}",
         ]
 
diff --git a/src/provisioningserver/drivers/pod/lxd.py b/src/provisioningserver/drivers/pod/lxd.py
index 0265d4f..4131b8c 100644
--- a/src/provisioningserver/drivers/pod/lxd.py
+++ b/src/provisioningserver/drivers/pod/lxd.py
@@ -876,7 +876,7 @@ class LXDPodDriver(PodDriver):
                 try:
                     client.authenticate(password)
                 except LXDAPIException as e:
-                    raise Error(f"Password authentication failed: {e}")
+                    raise Error(f"Password authentication failed: {e}") from e
             return client
 
         try:
@@ -899,10 +899,10 @@ class LXDPodDriver(PodDriver):
                 raise Error(
                     "Certificate is not trusted and no password was given"
                 )
-        except ClientConnectionFailed:
+        except ClientConnectionFailed as e:
             raise LXDPodError(
-                f"Pod {pod_id}: Failed to connect to the LXD REST API."
-            )
+                f"Pod {pod_id}: Failed to connect to the LXD REST API: {e}"
+            ) from e
         else:
             yield client
         finally: