sts-sponsors team mailing list archive

[Adam Collard <mp+437498@xxxxxxxxxxxxxxxxxx>]

Adam Collard has proposed merging ~adam-collard/maas:lxd-no-proxy into maas:master.

Commit message:
Create a Session before instantiating the pylxd Client


Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~adam-collard/maas/+git/maas/+merge/437498
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~adam-collard/maas:lxd-no-proxy into maas:master.

diff --git a/src/provisioningserver/drivers/pod/lxd.py b/src/provisioningserver/drivers/pod/lxd.py
index 0f67883..7a851f8 100644
--- a/src/provisioningserver/drivers/pod/lxd.py
+++ b/src/provisioningserver/drivers/pod/lxd.py
@@ -13,6 +13,7 @@ from urllib.parse import urlparse
 import uuid
 
 from pylxd import Client
+from pylxd.client import get_session_for_url
 from pylxd.exceptions import ClientConnectionFailed, LXDAPIException, NotFound
 import urllib3
 
@@ -849,14 +850,12 @@ class LXDPodDriver(PodDriver):
             raise Error("No certificates available")
 
         def client_with_certs(cert):
+            session = get_session_for_url(endpoint, cert=cert, verify=False)
+            # Don't inherit proxy environment variables
+            session.trust_env = False
             client = self._pylxd_client_class(
-                endpoint=endpoint,
-                project=project,
-                cert=cert,
-                verify=False,
+                endpoint=endpoint, project=project, session=session
             )
-            # Don't inherit proxy environment variables
-            client.api.session.trust_env = False
             if not client.trusted and password:
                 try:
                     client.authenticate(password)