Skip to content

Commit

Permalink
Merge pull request juju#15545 from barrettj12/cmd-docs
Browse files Browse the repository at this point in the history
juju#15545

This improves the Markdown output.
  • Loading branch information
jujubot authored May 2, 2023
2 parents b27ec03 + bcec3c5 commit 288774b
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions cmd/juju/controller/addmodel.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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].
`

Expand Down

0 comments on commit 288774b

Please sign in to comment.