Merge lp:~cprov/adt-cloud-worker/no-proxy into lp:adt-cloud-worker

Proposed by Celso Providelo on 2015-05-12
Status: Merged
Approved by: Celso Providelo on 2015-05-12
Approved revision: 53
Merged at revision: 48
Proposed branch: lp:~cprov/adt-cloud-worker/no-proxy
Merge into: lp:adt-cloud-worker
Diff against target: 40 lines (+10/-2)
2 files modified
dep8/tests/test_proxy.py (+9/-1)
uci-nova (+1/-1)
To merge this branch: bzr merge lp:~cprov/adt-cloud-worker/no-proxy
Reviewer Review Type Date Requested Status
Francis Ginther 2015-05-12 Approve on 2015-05-12
Martin Pitt (community) Approve on 2015-05-12
Review via email: mp+258835@code.launchpad.net

Commit message

Extending 'no_proxy' testbed setup to allow direct access to 127.0.1.1, internal and novalocal (default PS4 domain). ubuntu.com and lp.net access are still only available via proxy.

Description of the change

Access to .ubuntu.com, .lp.net should continue to happen via http_proxy in adt-cloud, this is different than the original (vm-based) infrastructure.

However, 127.0.1.1, internal and novalocal (default PS4/OS domain) were added to the no_proxy env var, following the original infrastructure configuration.

Testing/probing source are ubuntu-make and ubuntu-developer-tools-center.

All the known-failures (external-access-related ones) remain in the same state (https://docs.google.com/spreadsheets/d/1BblC5MooCac2zcXLZzx2PaWH1BWWc0eYaM9o0TCMz7w/ and https://trello.com/c/zSqZgQZk/67-extra-adjust-adt-cloud-testbed-no-proxy)

To post a comment you must log in.
Martin Pitt (pitti) wrote :

Thanks Celso!

review: Approve
lp:~cprov/adt-cloud-worker/no-proxy updated on 2015-05-12
50. By Celso Providelo on 2015-05-12

typo

51. By Celso Providelo on 2015-05-12

wiki.ubuntu.com will/should not be exposed directly, so squid3 tests will have to cope. 'novalocal' is the default nova domain and should be listed as no_proxy (ubuntu-make and ubuntu-developer-tools-center pass).

52. By Celso Providelo on 2015-05-12

Check for [archive,www].ubuntu.com and *.launchpad.net http[s] access.

53. By Celso Providelo on 2015-05-12

ubuntu.com and launchpad.net should be accessed via proxy.

Martin Pitt (pitti) wrote :

Thanks muchly, Celso! FWIW, I can't make any statement whether *.ubuntu.com and *.launchpad.net are supposed to be talked to via proxy (as that's not necessary anywhere else in the data center), but I trust you on that.

review: Approve
Francis Ginther (fginther) wrote :

Approve. Discussed the no_proxy changes with cprov over IRC.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dep8/tests/test_proxy.py'
2--- dep8/tests/test_proxy.py 2015-04-30 12:56:08 +0000
3+++ dep8/tests/test_proxy.py 2015-05-12 16:02:38 +0000
4@@ -33,6 +33,14 @@
5 "Failed to access {}".format(url)
6 )
7
8+ def test_generic_access(self):
9+ # All tests (theoretically) should be able to reach *.launchpad.net
10+ # and *.ubuntu.com via http_proxy, for fetching code or conveninent
11+ # testing payloads.
12+ self.assertAccess('https://launchpad.net/')
13+ self.assertAccess('http://archive.ubuntu.com/')
14+ self.assertAccess('http://www.ubuntu.com/')
15+
16 def test_unity_firefox_extension(self):
17 # 'unity-firefox-extension' test requires pypi for installing mozmill.
18 self.assertAccess('https://pypi.python.org/pypi')
19@@ -43,7 +51,7 @@
20
21 def test_linux(self):
22 # 'linux' test requires git access (tcp:9418) to kernel.ubuntu.com
23- # and a specific github (https) projet for patching.
24+ # and a specific github (https) project for patching.
25 exit_code = subprocess.call(
26 ['git', 'ls-remote',
27 'git://kernel.ubuntu.com/ubuntu/kernel-testing.git'],
28
29=== modified file 'uci-nova'
30--- uci-nova 2015-05-01 17:49:18 +0000
31+++ uci-nova 2015-05-12 16:02:38 +0000
32@@ -245,7 +245,7 @@
33 # Sets proxy-related environment variables, the local address and the
34 # configured archive_host are excluded from http[s] proxying and general
35 # http[s] proxying it set according to the user-given --proxy option.
36- environment_setup="archive_host=\`awk '/^deb .*(debian|ubuntu)/ { split(\$2, u, \"/\"); print u[3]; exit }' \"\$root/etc/apt/sources.list\"\`; echo \"no_proxy=\\\"localhost,127.0.0.1,localaddress,.localdomain.com,\${archive_host}\\\"\nhttp_proxy=\\\"${PROXY}\\\"\nhttps_proxy=\\\"${PROXY}\\\"\nHTTP_PROXY=\\\"${PROXY}\\\"\nHTTPS_PROXY=\\\"${PROXY}\\\"\" >> /etc/environment"
37+ environment_setup="archive_host=\`awk '/^deb .*(debian|ubuntu)/ { split(\$2, u, \"/\"); print u[3]; exit }' \"\$root/etc/apt/sources.list\"\`; echo \"no_proxy=\\\"127.0.0.1,127.0.1.1,localhost,localdomain,novalocal,internal,\${archive_host}\\\"\nhttp_proxy=\\\"${PROXY}\\\"\nhttps_proxy=\\\"${PROXY}\\\"\nHTTP_PROXY=\\\"${PROXY}\\\"\nHTTPS_PROXY=\\\"${PROXY}\\\"\" >> /etc/environment"
38
39 # generate cloud-init user data; mostly for manage_etc_hosts, but also get
40 # rid of some unnecessary stuff in the VM

Subscribers

People subscribed via source and target branches