juju: only use configstore for bootstrap config #4490

Merged
merged 3 commits into from Feb 22, 2016

Conversation

Projects
None yet
2 participants
Member

axw commented Feb 22, 2016

In juju/api.go, we now only use configstore for
the bootstrap config address resolution fallback.

juju.NewAPIState has been removed, and inlined
into the few tests that required it.

cmd/juju/register.go no longer calls
juju.UpdateControllerAddresses directly, but
first records the addresses used to contact the
controller in the first place, and then relies
on the proceeding API connection to update the
store.

Finally, we add a "switch-user" command, which
was the reason behind this branch in the first
place.

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

Member

axw commented Feb 22, 2016

$$merge$$

Contributor

jujubot commented Feb 22, 2016

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

Contributor

jujubot commented Feb 22, 2016

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

Member

axw commented Feb 22, 2016

$$merge$$

Contributor

jujubot commented Feb 22, 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 Feb 22, 2016

Merge pull request #4490 from axw/juju-switchuser
juju: only use configstore for bootstrap config

In juju/api.go, we now only use configstore for
the bootstrap config address resolution fallback.

juju.NewAPIState has been removed, and inlined
into the few tests that required it.

cmd/juju/register.go no longer calls
juju.UpdateControllerAddresses directly, but
first records the addresses used to contact the
controller in the first place, and then relies
on the proceeding API connection to update the
store.

Finally, we add a "switch-user" command, which
was the reason behind this branch in the first
place.

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

@jujubot jujubot merged commit 75272f1 into juju:master Feb 22, 2016

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