← Back to team overview

sts-sponsors team mailing list archive

Re: [Merge] ~adam-collard/maas:lxd-no-proxy into maas:master

 

Review: Approve

+1

small nit inline

Diff comments:

> diff --git a/src/provisioningserver/drivers/pod/lxd.py b/src/provisioningserver/drivers/pod/lxd.py
> index 0f67883..571ef0b 100644
> --- a/src/provisioningserver/drivers/pod/lxd.py
> +++ b/src/provisioningserver/drivers/pod/lxd.py
> @@ -849,14 +850,16 @@ 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

I'd make this an XXX comment, and mention why we don't want the proxy.

> +            session.trust_env = False
>              client = self._pylxd_client_class(
>                  endpoint=endpoint,
>                  project=project,
>                  cert=cert,
>                  verify=False,
> +                session=session,
>              )
> -            # Don't inherit proxy environment variables
> -            client.api.session.trust_env = False
>              if not client.trusted and password:
>                  try:
>                      client.authenticate(password)


-- 
https://code.launchpad.net/~adam-collard/maas/+git/maas/+merge/437498
Your team MAAS Committers is subscribed to branch maas:master.



References