Fix InstanceConfig.SetTools usage #5215

Merged
merged 3 commits into from Apr 19, 2016

Conversation

Projects
None yet
2 participants
Member

axw commented Apr 19, 2016

InstanceConfig.SetTools was being strict about requiring tools
to have URLs, which is not the case when using --upload-tools.
It may be worth revisiting this later, but for now we revert
to not checking the URLs.

Also, fix the Azure provider to filter tools by the chosen
architecture. It was working by luck previously because the
first item in the tools list would always be amd64. If we don't
filter, then SetTools rightly throws an error because there are
multiple tools with differing architectures.

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

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

axw added some commits Apr 19, 2016

Fix InstanceConfig.SetTools usage
InstanceConfig.SetTools was being strict about requiring tools
to have URLs, which is not the case when using --upload-tools.
It may be worth revisiting this later, but for now we revert
to not checking the URLs.

Also, fix the Azure provider to filter tools by the chosen
architecture. It was working by luck previously because the
first item in the tools list would always be amd64. If we don't
filter, then SetTools rightly throws an error because there are
multiple tools with differing architectures.

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

axw commented Apr 19, 2016

$$merge$$

Contributor

jujubot commented Apr 19, 2016

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

@jujubot jujubot merged commit ec4cbd5 into juju:master Apr 19, 2016

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