canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+458349@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:ppa-launchpad-net into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/458349
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:ppa-launchpad-net into autopkgtest-cloud:master.

diff --git a/mojo/service-bundle b/mojo/service-bundle
index 1573a76..6986c7f 100644
--- a/mojo/service-bundle
+++ b/mojo/service-bundle
@@ -15,7 +15,7 @@
 {%- if stage_name == "production" or stage_name == "staging" %}
     {%- set http_proxy = "http://squid.internal:3128"; %}
     {%- set https_proxy = "http://squid.internal:3128"; %}
-    {%- 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,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com" %}
+    {%- 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,ppa.launchpad.net,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com" %}
 {%- endif %}
 
 description: "autopkgtest-cloud"