provider/{lxd,gce,vsphere} fix ControllerInstances #4819

Merged
merged 2 commits into from Mar 21, 2016

Conversation

Projects
None yet
3 participants
Member

axw commented Mar 21, 2016

In ControllerInstances, use controller-uuid rather than
uuid to filter machines. Controllers are always created
with uuid==controller-uuid, but ControllerInstances may
be called on an Environ with uuid!=controller-uuid.

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

provider/{lxd,gce,vsphere} fix ControllerInstances
In ControllerInstances, use controller-uuid rather than
uuid to filter machines. Controllers are always created
with uuid==controller-uuid, but ControllerInstances may
be called on an Environ with uuid!=controller-uuid.
provider/common/util.go
-func EnvFullName(env environs.Environ) string {
- modelUUID := env.Config().UUID()
+// ModelFullName returns a string based on the provided model
+// UUID that is suitable for identifying the env on a provider.
@wallyworld

wallyworld Mar 21, 2016

Owner

s/env/model

@axw

axw Mar 21, 2016

Member

Ehh, actually, I think it is an environ and not a model. It's the manifestation of a model. I should have left the function name alone.

Member

axw commented Mar 21, 2016

$$merge$$

Contributor

jujubot commented Mar 21, 2016

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

jujubot added a commit that referenced this pull request Mar 21, 2016

Merge pull request #4819 from axw/controllerinstances-controlleruuid
provider/{lxd,gce,vsphere} fix ControllerInstances

In ControllerInstances, use controller-uuid rather than
uuid to filter machines. Controllers are always created
with uuid==controller-uuid, but ControllerInstances may
be called on an Environ with uuid!=controller-uuid.

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

@jujubot jujubot merged commit 380e1f3 into juju:admin-controller-model Mar 21, 2016

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