MAAS CI

Merge ~adam-collard/maas-ci:peer-proxy-config into ~maas-committers/maas-ci/+git/system-tests:master

  1. Git
  2. lp:~adam-collard/maas-ci
  3. peer-proxy-config
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Merged at revision: 7cf5b79ecb3d431391f327e0f972ca4f913d9e22
Proposed branch: ~adam-collard/maas-ci:peer-proxy-config
Merge into: ~maas-committers/maas-ci/+git/system-tests:master
Diff against target: 13 lines (+1/-1)
1 file modified
systemtests/region.py (+1/-1)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
Review via email: mp+405301@code.launchpad.net

Commit message

Change interpretation of proxy config

Configure proxy as peer when we have an upstream proxy and
use_internal is true.

The matrix now looks like:

 none = NOT use_internal AND NOT http
 internal = use_internal AND NOT http
 external = NOT use_internal AND http
 peer = use_internal AND http

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/systemtests/region.py b/systemtests/region.py
2index ec75e73..a681639 100644
3--- a/systemtests/region.py
4+++ b/systemtests/region.py
5@@ -47,7 +47,7 @@ class MAASRegion:
6 proxy_config = config.get("proxy", {})
7 http_proxy = proxy_config.get("http", "")
8 use_internal = proxy_config.get("use_internal", True)
9- use_peer_proxy = bool(http_proxy) and not use_internal
10+ use_peer_proxy = bool(http_proxy) and use_internal
11 enable_http_proxy = use_internal
12 return {
13 "http_proxy": http_proxy,

Subscribers

People subscribed via source and target branches

to all changes: