diff --git a/domain/schema/controller.go b/domain/schema/controller.go index e65d65d83ea..fe0e68498f0 100644 --- a/domain/schema/controller.go +++ b/domain/schema/controller.go @@ -50,7 +50,6 @@ func ControllerDDL() *schema.Schema { objectStoreMetadataSchema, changeLogTriggersForTable("object_store_metadata_path", "path", tableObjectStoreMetadata), userSchema, - modelConfigDefaults, flagSchema, } @@ -583,23 +582,6 @@ CREATE TABLE user_activation_key ( );`) } -// modelConfigDefaults is responsible for making a model config defaults table. -// The purpose of this table is to offer model defaults to all newly created -// models in Juju regardless of what cloud or cloud region the model is attached -// to. -// -// Previously Juju has been solving this problem by using the controller model -// config as this source of information. We want to stop special casing the -// controller's model and using it as a defaults source for other models. -func modelConfigDefaults() schema.Patch { - return schema.MakePatch(` -CREATE TABLE model_config_defaults ( - key TEXT PRIMARY KEY, - value TEXT -) -`) -} - func flagSchema() schema.Patch { return schema.MakePatch(` CREATE TABLE flag ( diff --git a/domain/schema/schema_test.go b/domain/schema/schema_test.go index eab4daf81ef..6e88f6f8793 100644 --- a/domain/schema/schema_test.go +++ b/domain/schema/schema_test.go @@ -99,9 +99,6 @@ func (s *schemaSuite) TestControllerDDLApply(c *gc.C) { "user_password", "user_activation_key", - // Model Config Defaults - "model_config_defaults", - // Flags "flag", )