autopkgtest-cloud

Merge ~andersson123/autopkgtest-cloud:keystone-object-storage-to-no-proxy into autopkgtest-cloud:master

  1. Git
  2. lp:~andersson123/autopkgtest-cloud
  3. keystone-object-storage-to-no-proxy
  4. Merge into master
Proposed by Tim Andersson
Status: Merged
Approved by: Brian Murray
Approved revision: 5b03cb9ae2718b6ba2eea1ecb8e813f7bcedb6fa
Merged at revision: 5b03cb9ae2718b6ba2eea1ecb8e813f7bcedb6fa
Proposed branch: ~andersson123/autopkgtest-cloud:keystone-object-storage-to-no-proxy
Merge into: autopkgtest-cloud:master
Diff against target: 13 lines (+1/-1)
1 file modified
mojo/service-bundle (+1/-1)
Reviewer Review Type Date Requested Status
Paride Legovini Approve
Brian Murray Approve
Review via email: mp+456525@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) :
review: Approve
Revision history for this message
Paride Legovini (paride) wrote (last edit ):

I wonder if we could add ubuntu.com,canonical.com to no_proxy. Or in other words: I wonder if there is any service under .ubuntu.com | .canonical.com for which we do need to pass via the proxy.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/mojo/service-bundle b/mojo/service-bundle
2index 26b74c0..17d8bbd 100644
3--- a/mojo/service-bundle
4+++ b/mojo/service-bundle
5@@ -15,7 +15,7 @@
6 {%- if stage_name == "production" or stage_name == "staging" %}
7 {%- set http_proxy = "http://squid.internal:3128" %}
8 {%- set https_proxy = "http://squid.internal:3128" %}
9- {%- set no_proxy = "127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,launchpad.net,10.24.0.0/24" %}
10+ {%- set no_proxy = "127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com" %}
11 {%- endif %}
12
13 description: "autopkgtest-cloud"

Subscribers

People subscribed via source and target branches