Take account of provider specific config when creating models and boo…

…tstrapping

cmd/juju/commands/bootstrap.go

@@ -13,6 +13,7 @@ import (
 	"github.com/juju/cmd"
 	"github.com/juju/errors"
 	"github.com/juju/gnuflag"
+	"github.com/juju/schema"
 	"github.com/juju/utils"
 	"github.com/juju/utils/featureflag"
 	"github.com/juju/version"
@@ -372,14 +373,14 @@ func (c *bootstrapCommand) Run(ctx *cmd.Context) (resultErr error) {
 		return errors.Trace(err)
 	}
 
+	provider, err := environs.Provider(cloud.Type)
+	if err != nil {
+		return errors.Trace(err)
+	}
 	// Custom clouds may not have explicitly declared support for any auth-
 	// types, in which case we'll assume that they support everything that
 	// the provider supports.
 	if len(cloud.AuthTypes) == 0 {
-		provider, err := environs.Provider(cloud.Type)
-		if err != nil {
-			return errors.Trace(err)
-		}
 		for authType := range provider.CredentialSchemas() {
 			cloud.AuthTypes = append(cloud.AuthTypes, authType)
 		}
@@ -452,9 +453,33 @@ func (c *bootstrapCommand) Run(ctx *cmd.Context) (resultErr error) {
 	if err != nil {
 		return errors.Trace(err)
 	}
+
+	// The provider may define some custom attributes specific
+	// to the provider. These will be added to the model config.
+	providerAttrs := make(map[string]interface{})
+	if ps, ok := provider.(config.ConfigSource); ok {
+		for attr := range ps.ProviderConfig() {
+			if v, ok := userConfigAttrs[attr]; ok {
+				providerAttrs[attr] = v
+			}
+		}
+		fields := schema.FieldMap(ps.ProviderConfig(), ps.ProviderConfigDefaults())
+		if coercedAttrs, err := fields.Coerce(providerAttrs, nil); err != nil {
+			return errors.Annotatef(err, "invalid attribute value(s) for %v cloud", cloud.Type)
+		} else {
+			providerAttrs = coercedAttrs.(map[string]interface{})
+		}
+	}
+	logger.Debugf("provider attrs: %v", providerAttrs)
 	for k, v := range userConfigAttrs {
 		modelConfigAttrs[k] = v
 	}
+	// Provider specific attributes are either already specified in model
+	// config (but may have been coerced), or were not present. Either way,
+	// copy them in.
+	for k, v := range providerAttrs {
+		modelConfigAttrs[k] = v
+	}
 	bootstrapConfigAttrs := make(map[string]interface{})
 	controllerConfigAttrs := make(map[string]interface{})
 	// Based on the attribute names in clouds.yaml, create

cmd/juju/commands/bootstrap_test.go

@@ -261,6 +261,10 @@ func (s *BootstrapSuite) run(c *gc.C, test bootstrapTest) testing.Restorer {
 		"type":            "dummy",
 		"default-series":  "raring",
 		"authorized-keys": "public auth key\n",
+		// Dummy provider defaults
+		"broken":     "",
+		"secret":     "pork",
+		"controller": false,
 	}
 	for k, v := range config.ConfigDefaults() {
 		if _, ok := expected[k]; !ok {
@@ -1157,7 +1161,7 @@ func (s *BootstrapSuite) TestBootstrapConfigFile(c *gc.C) {
 		c, s.newBootstrapCommand(), "ctrl", "dummy",
 		"--config", configFile,
 	)
-	c.Assert(err, gc.ErrorMatches, `controller: expected bool, got string.*`)
+	c.Assert(err, gc.ErrorMatches, `invalid attribute value\(s\) for dummy cloud: controller: expected bool, got string.*`)
 }
 
 func (s *BootstrapSuite) TestBootstrapMultipleConfigFiles(c *gc.C) {
@@ -1210,9 +1214,9 @@ func (s *BootstrapSuite) TestBootstrapCloudConfigAndAdHoc(c *gc.C) {
 		"--auto-upgrade",
 		// Configuration specified on the command line overrides
 		// anything specified in files, no matter what the order.
-		"--config", "controller=false",
+		"--config", "controller=not-a-bool",
 	)
-	c.Assert(err, gc.ErrorMatches, "failed to bootstrap model: dummy.Bootstrap is broken")
+	c.Assert(err, gc.ErrorMatches, `invalid attribute value\(s\) for dummy cloud: controller: expected bool, got .*`)
 }
 
 func (s *BootstrapSuite) TestBootstrapPrintClouds(c *gc.C) {

environs/config/config.go

@@ -1017,7 +1017,7 @@ func (cfg *Config) ValidateUnknownAttrs(fields schema.Fields, defaults schema.De
 		if fields[name] == nil {
 			if val, isString := value.(string); isString && val != "" {
 				// only warn about attributes with non-empty string values
-				logger.Errorf("unknown config field %q", name)
+				logger.Warningf("unknown config field %q", name)
 			}
 			result[name] = value
 		}

environs/config/source.go

@@ -3,6 +3,10 @@
 
 package config
 
+import (
+	"github.com/juju/schema"
+)
+
 // These constants define named sources of model config attributes.
 // After a call to UpdateModelConfig, any attributes added/removed
 // will have a source of JujuModelConfigSource.
@@ -42,3 +46,15 @@ func (c ConfigValues) AllAttrs() map[string]interface{} {
 	}
 	return result
 }
+
+// ConfigSource instances provide information on config attributes
+// and the default attribute values.
+type ConfigSource interface {
+	// ProviderConfig returns extra config attributes specific
+	// to this provider only.
+	ProviderConfig() schema.Fields
+
+	// ProviderConfigDefaults returns the default values for the
+	// provider specific config attributes.
+	ProviderConfigDefaults() schema.Defaults
+}

provider/dummy/environs.go

@@ -509,6 +509,20 @@ func (p *environProvider) Schema() environschema.Fields {
 	return fields
 }
 
+var _ config.ConfigSource = (*environProvider)(nil)
+
+// ProviderConfig returns extra config attributes specific
+// to this provider only.
+func (p environProvider) ProviderConfig() schema.Fields {
+	return configFields
+}
+
+// ProviderConfigDefaults returns the default values for the
+// provider specific config attributes.
+func (p environProvider) ProviderConfigDefaults() schema.Defaults {
+	return configDefaults
+}
+
 func (p *environProvider) CredentialSchemas() map[cloud.AuthType]cloud.CredentialSchema {
 	return map[cloud.AuthType]cloud.CredentialSchema{cloud.EmptyAuthType: {}}
 }

provider/ec2/config.go

@@ -71,6 +71,18 @@ func (environProvider) Schema() environschema.Fields {
 	return fields
 }
 
+// ProviderConfig returns extra config attributes specific
+// to this provider only.
+func (p environProvider) ProviderConfig() schema.Fields {
+	return configFields
+}
+
+// ProviderConfigDefaults returns the default values for the
+// provider specific config attributes.
+func (p environProvider) ProviderConfigDefaults() schema.Defaults {
+	return configDefaults
+}
+
 func validateConfig(cfg, old *config.Config) (*environConfig, error) {
 	// Check for valid changes for the base config values.
 	if err := config.Validate(cfg, old); err != nil {

provider/ec2/environ_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/juju/juju/constraints"
 	"github.com/juju/juju/environs"
+	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/environs/simplestreams"
 	"github.com/juju/juju/instance"
 	"github.com/juju/juju/network"
@@ -18,6 +19,7 @@ import (
 // Ensure EC2 provider supports the expected interfaces,
 var (
 	_ environs.NetworkingEnviron = (*environ)(nil)
+	_ config.ConfigSource        = (*environProvider)(nil)
 	_ simplestreams.HasRegion    = (*environ)(nil)
 	_ state.Prechecker           = (*environ)(nil)
 	_ instance.Distributor       = (*environ)(nil)

provider/gce/provider.go

@@ -5,6 +5,7 @@ package gce
 
 import (
 	"github.com/juju/errors"
+	"github.com/juju/schema"
 	"gopkg.in/juju/environschema.v1"
 
 	"github.com/juju/juju/cloud"
@@ -59,6 +60,18 @@ func (environProvider) Schema() environschema.Fields {
 	return fields
 }
 
+// ProviderConfig returns extra config attributes specific
+// to this provider only.
+func (p environProvider) ProviderConfig() schema.Fields {
+	return configFields
+}
+
+// ProviderConfigDefaults returns the default values for the
+// provider specific config attributes.
+func (p environProvider) ProviderConfigDefaults() schema.Defaults {
+	return configDefaults
+}
+
 // UpgradeModelConfig is specified in the ModelConfigUpgrader interface.
 func (environProvider) UpgradeConfig(cfg *config.Config) (*config.Config, error) {
 	return configWithDefaults(cfg)

provider/gce/testing_test.go

@@ -31,6 +31,11 @@ import (
 	coretools "github.com/juju/juju/tools"
 )
 
+// Ensure GCE provider supports the expected interfaces.
+var (
+	_ config.ConfigSource = (*environProvider)(nil)
+)
+
 // These values are fake GCE auth credentials for use in tests.
 const (
 	ClientName  = "ba9876543210-0123456789abcdefghijklmnopqrstuv"

provider/lxd/provider.go

@@ -7,6 +7,7 @@ package lxd
 
 import (
 	"github.com/juju/errors"
+	"github.com/juju/schema"
 	"gopkg.in/juju/environschema.v1"
 
 	"github.com/juju/juju/cloud"
@@ -95,3 +96,15 @@ func (environProvider) Schema() environschema.Fields {
 	}
 	return fields
 }
+
+// ProviderConfig returns extra config attributes specific
+// to this provider only.
+func (p environProvider) ProviderConfig() schema.Fields {
+	return configFields
+}
+
+// ProviderConfigDefaults returns the default values for the
+// provider specific config attributes.
+func (p environProvider) ProviderConfigDefaults() schema.Defaults {
+	return configDefaults
+}

provider/lxd/testing_test.go

@@ -30,6 +30,11 @@ import (
 	"github.com/juju/version"
 )
 
+// Ensure LXD provider supports the expected interfaces.
+var (
+	_ config.ConfigSource = (*environProvider)(nil)
+)
+
 // These values are stub LXD client credentials for use in tests.
 const (
 	PublicKey = `-----BEGIN CERTIFICATE-----

provider/maas/config.go

@@ -47,6 +47,18 @@ func (maasEnvironProvider) Schema() environschema.Fields {
 	return fields
 }
 
+// ProviderConfig returns extra config attributes specific
+// to this provider only.
+func (p maasEnvironProvider) ProviderConfig() schema.Fields {
+	return configFields
+}
+
+// ProviderConfigDefaults returns the default values for the
+// provider specific config attributes.
+func (p maasEnvironProvider) ProviderConfigDefaults() schema.Defaults {
+	return configDefaults
+}
+
 func (prov maasEnvironProvider) Validate(cfg, oldCfg *config.Config) (*config.Config, error) {
 	// Validate base configuration change before validating MAAS specifics.
 	err := config.Validate(cfg, oldCfg)

provider/maas/config_test.go

@@ -13,6 +13,11 @@ import (
 	"github.com/juju/juju/testing"
 )
 
+// Ensure MAAS provider supports the expected interfaces.
+var (
+	_ config.ConfigSource = (*maasEnvironProvider)(nil)
+)
+
 type configSuite struct {
 	testing.BaseSuite
 }

provider/openstack/config.go

@@ -27,6 +27,8 @@ var configSchema = environschema.Fields{
 	},
 }
 
+var configDefaults = schema.Defaults{}
+
 var configFields = func() schema.Fields {
 	fs, _, err := configSchema.ValidationSchema()
 	if err != nil {
@@ -69,6 +71,18 @@ func (EnvironProvider) Schema() environschema.Fields {
 	return fields
 }
 
+// ProviderConfig returns extra config attributes specific
+// to this provider only.
+func (p EnvironProvider) ProviderConfig() schema.Fields {
+	return configFields
+}
+
+// ProviderConfigDefaults returns the default values for the
+// provider specific config attributes.
+func (p EnvironProvider) ProviderConfigDefaults() schema.Defaults {
+	return configDefaults
+}
+
 func (p EnvironProvider) Validate(cfg, old *config.Config) (valid *config.Config, err error) {
 	// Check for valid changes for the base config values.
 	if err := config.Validate(cfg, old); err != nil {

provider/openstack/provider.go

@@ -49,7 +49,10 @@ type EnvironProvider struct {
 	FirewallerFactory FirewallerFactory
 }
 
-var _ environs.EnvironProvider = (*EnvironProvider)(nil)
+var (
+	_ environs.EnvironProvider = (*EnvironProvider)(nil)
+	_ environs.ProviderSchema  = (*EnvironProvider)(nil)
+)
 
 var providerInstance *EnvironProvider = &EnvironProvider{
 	OpenstackCredentials{},

state/internal_test.go

@@ -114,3 +114,7 @@ func (internalStatePolicy) InstanceDistributor() (instance.Distributor, error) {
 func (internalStatePolicy) StorageProviderRegistry() (storage.ProviderRegistry, error) {
 	return provider.CommonStorageProviders(), nil
 }
+
+func (internalStatePolicy) ProviderConfigSource() (config.ConfigSource, error) {
+	return nil, errors.NotImplementedf("ConfigSource")
+}

state/modelconfig.go

@@ -5,6 +5,7 @@ package state
 
 import (
 	"github.com/juju/errors"
+	"github.com/juju/schema"
 
 	"github.com/juju/juju/controller"
 	"github.com/juju/juju/environs/config"
@@ -283,7 +284,7 @@ type modelConfigSource struct {
 // overall config values, later values override earlier ones.
 func modelConfigSources(st *State) []modelConfigSource {
 	return []modelConfigSource{
-		{config.JujuDefaultSource, func() (attrValues, error) { return config.ConfigDefaults(), nil }},
+		{config.JujuDefaultSource, st.defaultInheritedConfig},
 		{config.JujuControllerSource, st.controllerInheritedConfig},
 		{config.JujuControllerSource, st.regionInheritedConfig},
 	}
@@ -295,6 +296,30 @@ const (
 	controllerInheritedSettingsGlobalKey = "controller"
 )
 
+// defaultInheritedConfig returns config values which are defined
+// as defaults in either Juju or the state's environ provider.
+func (st *State) defaultInheritedConfig() (attrValues, error) {
+	var defaults = make(map[string]interface{})
+	for k, v := range config.ConfigDefaults() {
+		defaults[k] = v
+	}
+	providerDefaults, err := st.environsProviderConfigSource()
+	if errors.IsNotImplemented(err) {
+		return defaults, nil
+	} else if err != nil {
+		return nil, errors.Trace(err)
+	}
+	fields := schema.FieldMap(providerDefaults.ProviderConfig(), providerDefaults.ProviderConfigDefaults())
+	if coercedAtts, err := fields.Coerce(defaults, nil); err != nil {
+		return nil, errors.Trace(err)
+	} else {
+		for k, v := range coercedAtts.(map[string]interface{}) {
+			defaults[k] = v
+		}
+	}
+	return defaults, nil
+}
+
 // controllerInheritedConfig returns the inherited config values
 // sourced from the local cloud config.
 func (st *State) controllerInheritedConfig() (attrValues, error) {