/juju

Initialise default proxy config from environment #7002

Merged
merged 1 commit into from Feb 17, 2017

Conversation

Reviewers

@axw axw

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@babbageclunk @jujubot @axw
@babbageclunk
Member

babbageclunk commented Feb 17, 2017

Description of change

The proxy info is set into the environment by cloud-init for the
bootstrap, so we need to load it here so that we have the correct values
for requests made during bootstrapping. before the proxyupdater is running.

QA steps

  • bootstrap with proxy settings
  • ensure that initial web requests made during bootstrap go via the proxy

Bug reference

Referenced from this comment: https://bugs.launchpad.net/juju/+bug/1633788/comments/30
Part of fixing: https://bugs.launchpad.net/juju/2.1/+bug/1654591
@babbageclunk
Initialise proxy config from environment 
The proxy info is set into the environment by cloud-init for the
bootstrap, so we need to load it here so that we have the correct values
before the proxyupdater is running.
f3c8075
@axw

axw approved these changes Feb 17, 2017
View changes

@babbageclunk
Member

babbageclunk commented Feb 17, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Feb 17, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit 191f572 into juju:2.1 Feb 17, 2017

@babbageclunk babbageclunk deleted the babbageclunk:initial-proxy branch Feb 17, 2017

babbageclunk added a commit to babbageclunk/juju that referenced this pull request Feb 17, 2017

@jujubot @babbageclunk
Merge pull request #7002 from babbageclunk/initial-proxy 
Initialise default proxy config from environment

## Description of change

The proxy info is set into the environment by cloud-init for the
bootstrap, so we need to load it here so that we have the correct values
for requests made during bootstrapping. before the proxyupdater is running. 

## QA steps

* bootstrap with proxy settings
* ensure that initial web requests made during bootstrap go via the proxy

## Bug reference

Referenced from this comment: https://bugs.launchpad.net/juju/+bug/1633788/comments/30
Part of fixing: https://bugs.launchpad.net/juju/2.1/+bug/1654591
153b1fb

@babbageclunk babbageclunk referenced this pull request Feb 17, 2017

Merged

Merge fix for proxy initialisation from 2.1 #7004

jujubot added a commit that referenced this pull request Feb 17, 2017

@jujubot
Merge pull request #7004 from babbageclunk/merge-proxy-fix 
Merge fix for proxy initialisation from 2.1

Merge #7002 into develop - it landed after the rest of the changes from 2.1 were merged.
19d4074
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment