cloudconfig: honour full tools list #5226

Merged
merged 4 commits into from Apr 21, 2016

Conversation

Projects
None yet
2 participants
Member

axw commented Apr 20, 2016

In order to properly support bringing up machines in a model
with a private network separate from the controller's, we
must attempt to download from all of the tools URLs we have
available. This means we will not only attempting each controller,
but each controller by all of their addresses.

Windows was still only attempting the first URL. This has been
fixed, so that we now attempt all of the URLs and then retry
the whole lot with a delay.

While making the change, it was found that tools catalogues
were not properly model-aware. The collection has been made
model-specific, and we have changed the tools storage to combine
the model and controller stores. This means that if you have
tools in the controller model, you can see them from the hosted
models. Any tools uploaded to a hosted model will take precedence,
and do not affect any other model.

This branch is a precursor to updating the Azure provider so that
hosted models are entirely isolated, and do not share the controller's
private virtual network.

Fixes https://bugs.launchpad.net/juju-core/+bug/1571832

(Review request: http://reviews.vapour.ws/r/4652/)

axw added some commits Apr 20, 2016

cloudconfig: honour full tools list
In order to properly support bringing up machines in a model
with a private network separate from the controller's, we
must attempt to download from all of the tools URLs we have
available. This means we will not only attempting each controller,
but each controller by all of their addresses.

Windows was still only attempting the first URL. This has been
fixed, so that we now attempt all of the URLs and then retry
the whole lot with a delay.

While making the change, it was found that tools catalogues
were not properly model-aware. The collection has been made
model-specific, and we have changed the tools storage to combine
the model and controller stores. This means that if you have
tools in the controller model, you can see them from the hosted
models. Any tools uploaded to a hosted model will take precedence,
and do not affect any other model.

Fixes https://bugs.launchpad.net/juju-core/+bug/1571832
Member

axw commented Apr 21, 2016

$$merge$$

Contributor

jujubot commented Apr 21, 2016

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

Contributor

jujubot commented Apr 21, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/7510

Member

axw commented Apr 21, 2016

$$doh$$

Contributor

jujubot commented Apr 21, 2016

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

@jujubot jujubot merged commit e1d959a into juju:master Apr 21, 2016

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