Merge "user-domain" feature branch into develop. #7099
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This can be used to select an alternative authentication domain when authenticating using an external identity manager. We also clean up the tests a little by using IsolationSuite instead of the deprecated FakeJujuXDGDataHomeSuite, and unexport some fields from APIContext that aren't used.
cmd/modelcmd: support JUJU_USER_DOMAIN This can be used to select an alternative authentication domain when authenticating using an external identity manager. We also clean up the tests a little by using IsolationSuite instead of the deprecated FakeJujuXDGDataHomeSuite, and unexport some fields from APIContext that aren't used.
merge origin/develop Merge the latest origin/develop commit into this feature branch. No conflicts worth talking about.
This is the first stage of a process that will eventually deprecate juju register in favour of juju login. Much of the new code in juju login is copied from juju register.
cmd/juju/user: implement controller login This is the first stage of a process that will eventually deprecate juju register in favour of juju login. Much of the new code in juju login is copied from juju register. To QA, try "juju login --host some-public-controller-address", which should do the same thing as "juju register some-public-controller-address". You could also try changing the table in getKnownControllerDomains and doing "juju login some-alias".
merge develop branch This merges the latest develop tip into the user-domain feature branch. No conflicts.
…es for public controllers
cmd/juju/user: consult external directory server to find out host names for public controllers This allows us to set up global aliases for public controllers.
cmd/juju/user: set controller name properly Because the controller wasn't being set, the ListControllers call was failing. The tests still passed because the ListControllers call was entirely mocked. Also make a backwardly incompatible change so that the old "juju login $user" behaviour is no longer the default - to log in as a user, the "--user" (or "-u") flag is required.
This adds the capability to specify a required user domain for users, and alters the juju login command so that it knows about public controllers.
frankban
approved these changes
Mar 15, 2017
urosj
approved these changes
Mar 15, 2017
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds the capability to specify a required user
domain for users, and alters the juju login command
so that it knows about public controllers.