Take account of provider specific config when creating models and bootstrapping #6079
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
| @@ -372,14 +373,15 @@ func (c *bootstrapCommand) Run(ctx *cmd.Context) (resultErr error) { | |||
| return errors.Trace(err) | |||
| } | |||
|
|
|||
| provider, err := environs.Provider(cloud.Type) | |||
| if err != nil { | |||
| logger.Infof(err.Error()) | |||
wallyworld
force-pushed
the
provider-default-config
branch
2 times, most recently
from
c33dc2a
to
0d95cef
Compare
| return nil, errors.Trace(err) | ||
| } | ||
| fields := schema.FieldMap(providerDefaults.ProviderConfig(), providerDefaults.ProviderConfigDefaults()) | ||
| if coercedAtts, err := fields.Coerce(defaults, nil); err != nil { |
|
Please add TODO(wallyworld) to have environs.EnvironProvider embed config.ConfigSource (sic), making it required, and drop the interface assertions. |
|
LGTM with a few niggles |
wallyworld
force-pushed
the
provider-default-config
branch
2 times, most recently
from
9628fd7
to
ea33222
Compare
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
|
Build failed: Generating tarball failed |
wallyworld
force-pushed
the
provider-default-config
branch
from
ea33222
to
8b8f609
Compare
|
|
|
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.
Fixes: https://bugs.launchpad.net/juju-core/+bug/1615552
Providers can define their own bespoke config in the environprovider. This is separate to the generic environs/config applicable to all providers. We need to account for this config when bootstrapping (apply the config to the model) and also when figuring out model config source ("default", "controller" etc).
Add code to bootstrap and also model config handling in state. A new state policy method is required to allow state to access the provider.
QA
Hack LXD provider to have config that doesn't do anything.
Bootstrap LXD, using --config to set one of the hacked values
$ juju model-config
$ juju model-defaults show the expected values
$ juju set-model-config foo=bar
(where foo is one of the provider attrs, no warning printed like we used to see)
$ juju model-config
shows the correct values
$ juju unset-model-config foo
resets the value to the provider value