merge 2.1 into develop and drive-by for help-tool service to application rename #7017

Merged

jujubot merged 6 commits into juju:develop from anastasiamac:service-help-rename

Feb 22, 2017

Member

anastasiamac commented Feb 22, 2017

Please provide the following details to expedite Pull Request review:

Description of change

Merge details:

Fixes "not valid tag" when listing models. (16f2674)
tools/lxdclient: use utils/proxy.DefaultConfig (ca0cbef)
tools/lxdclient: use utils/proxy.DefaultConfig (1d44d9c)

Drive-by: An oversight from a previously run simple sed script renaming 'service' to 'application'.

QA steps

'juju help-tool' output does not have any service references

Documentation changes

@juju/docs - may require some changes if 'juju help-tool' output is shown somewhere in the manual.

Bug reference

https://bugs.launchpad.net/juju/+bug/1599570
and probably others - am still looking

anastasiamac and others added some commits Feb 21, 2017


      Fix constructing models array.

c1d5de1


      Added unit test.

afe1a93


      Merge pull request #7011 from anastasiamac/fix-model-list-21

Fixes "not valid tag" when listing models.

## Please provide the following details to expedite Pull Request review:

----

## Description of change

A collection of models was constructed based on all controller models with predefined length. This caused issues in situations where models were not permitted to be seen by the current users or were being destroyed. With previous implementation, we'd end up with empty array elements and would fail when trying to parse model tags.

## QA steps

This is mostly timing related issue - models need to be destroyed or user permissions changed in the middle of 'juju models' call, specifically in between listing of models and iteration over the resulting collection to get model details. 
CI has a functional test that tends to hit the soft spot frequently.

All unit tests pass.

## Documentation changes

n/a

## Bug reference

The problem is hard to track but was observed in several bugs:
- https://bugs.launchpad.net/juju/+bug/1643076
- https://bugs.launchpad.net/juju/+bug/1643943
- https://bugs.launchpad.net/juju/+bug/1634926

16f2674


      tools/lxdclient: use utils/proxy.DefaultConfig

Use the Juju-managed HTTP proxy configuration
when making LXD client connections, rather than
the default proxy handler that looks at the
environment variables once and only once.

As well as this, initialise the proxy config
for the client, so that $http_proxy and co. will
be picked up by the client.

Fixes https://bugs.launchpad.net/juju/+bug/1642385

ca0cbef


      Merge pull request #7014 from axw/lp1642385-lxd-client-proxy

tools/lxdclient: use utils/proxy.DefaultConfig

## Description of change

Use the Juju-managed HTTP proxy configuration
when making LXD client connections, rather than
the default proxy handler that looks at the
environment variables once and only once.

As well as this, initialise the proxy config
for the client, so that $http_proxy and co. will
be picked up by the client.

## QA steps

(Address of LXD host on lxdbr0 is 10.250.243.1)

1. run an HTTP proxy, port 8080, on the LXD host; the proxy should reject attempts to proxy through to 10.250.243.1 (i.e. so if no_proxy doesn't include 10.250.243.1, the whole thing fails)
2. export no_proxy=10.250.243.1 http_proxy=http://10.250.243.1:8080 https_proxy=http://10.250.243.1:8080
3. create /tmp/config.yaml with the following contents:
```
apt-http-proxy: http://10.250.243.1:8080
apt-https-proxy: http://10.250.243.1:8080
http-proxy: http://10.250.243.1:8080
https-proxy: http://10.250.243.1:8080
no-proxy: 127.0.0.1,localhost,10.250.243.1
```
4. juju bootstrap localhost --config /tmp/config.yaml. As soon as the bootstrap container machine starts, lxc exec bash to it, and run the following:
```
ufw default deny outgoing
ufw default allow incoming
ufw allow out to 10.250.243.1
ufw enable
```
5. juju add-machine
6. ensure there's no "juju/trusty/amd64" alias: `lxc image alias delete juju/trusty/amd64` if necessary
7. juju add-machine --series=trusty

The two machines should be added successfully.

## Documentation changes

None.

## Bug reference

Fixes https://bugs.launchpad.net/juju/+bug/1642385

1d44d9c


      Rename service to application for help and help-tool.

26c85cc

axw approved these changes Feb 22, 2017

View changes

Member

anastasiamac commented Feb 22, 2017

$$merge$$

Contributor

jujubot commented Feb 22, 2017

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

jujubot merged commit `b1e0631` into juju:develop Feb 22, 2017

anastasiamac deleted the anastasiamac:service-help-rename branch Feb 22, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

You can't perform that action at this time.