-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request juju#15545 from barrettj12/cmd-docs
juju#15545 This improves the Markdown output.
- Loading branch information
Showing
1 changed file
with
7 additions
and
8 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -74,13 +74,12 @@ Model names may only contain lowercase letters, digits and hyphens, and | |
may not start with a hyphen. | ||
To add a model, Juju requires a credential: | ||
* if you have a default (or just one) credential defined at client | ||
(i.e. in credentials.yaml), then juju will use that; | ||
* if you have no default (and multiple) credentials defined at the client, | ||
then you must specify one using --credential; | ||
* as the admin user you can omit the credential, | ||
and the credential used to bootstrap will be used. | ||
* if you have a default (or just one) credential defined at client | ||
(i.e. in credentials.yaml), then juju will use that; | ||
* if you have no default (and multiple) credentials defined at the client, | ||
then you must specify one using --credential; | ||
* as the admin user you can omit the credential, | ||
and the credential used to bootstrap will be used. | ||
To add a credential for add-model, use one of the "juju add-credential" or | ||
"juju autoload-credentials" commands. These will add credentials | ||
|
@@ -97,7 +96,7 @@ without a cloud qualifier, then it is assumed to be in the same cloud | |
as the controller model. | ||
When adding --config, the default-series key is deprecated in favour of | ||
default-base .e.g. [email protected]. | ||
default-base, e.g. [email protected]. | ||
` | ||
|
||
|