Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Drop EnvironProvider methods #6083
Conversation
|
QA
|
|
lgtm |
anastasiamac
reviewed
Aug 25, 2016
| @@ -272,9 +275,34 @@ var unsupportedConstraints = []string{ | ||
| func (e *manualEnviron) ConstraintsValidator() (constraints.Validator, error) { | ||
| validator := constraints.NewValidator() | ||
| validator.RegisterUnsupported(unsupportedConstraints) | ||
| + if isRunningController() { |
anastasiamac
reviewed
Aug 25, 2016
| + if isRunningController() { | ||
| + validator.UpdateVocabulary(constraints.Arch, []string{arch.HostArch()}) | ||
| + } else { | ||
| + // We're running outsode of the Juju controller, so we must |
|
$$merge$$ |
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
|
Build failed: Does not match ['fixes-1616584', 'fixes-1614161', 'fixes-1611514', 'fixes-1475212'] |
|
This fixed a critical issue with the manual provider arch constraints, JFDIing. $$jfdi$$ |
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
|
Build failed: Does not match ['fixes-1616584', 'fixes-1614161', 'fixes-1611514', 'fixes-1475212'] |
|
$$JFDI$$ |
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
axw commentedAug 24, 2016
Drop EnvironProvider.RestrictedConfigAttributes
and EnvironProvider.SecretAttrs methods, and
stop adding credential attributes to and removing
them from model config.
To enable this, there are two functional changes:
restricted. This attribute is only used at
bootstrap time, so it doesn't need to be the
same in each model. Preferably it wouldn't be
in model config at all, but we don't have a
way of describing provider-specific bootstrap
config.
config attribute and extend the endpoint syntax
to permit user@host as well as host.