Remove some old code

wallyworld · wallyworld · commit 1dc2aede7cd5 · 2015-02-16T23:08:36.000+10:00
diff --git a/apiserver/provisioner/provisioner.go b/apiserver/provisioner/provisioner.go
@@ -561,7 +561,7 @@ func (p *ProvisionerAPI) machineVolumeParams(m *state.Machine) ([]params.VolumeP
 }
 
 // storageConfig returns the provider type and config attributes for the
-// specified poolName. If no such pool exists, assume poolName is
+// specified poolName. If no such pool exists, we check to see if poolName is
 // actually a provider type, in which case config will be empty.
 func storageConfig(st *state.State, poolName string) (storage.ProviderType, map[string]interface{}, error) {
 	pm := poolmanager.NewPoolManager(state.NewStateSettings(st))
diff --git a/cmd/jujud/bootstrap.go b/cmd/jujud/bootstrap.go
@@ -293,7 +293,7 @@ func (c *BootstrapCommand) startMongo(addrs []network.Address, agentConfig agent
 // populateDefaultStoragePools creates the default storage pools.
 func (c *BootstrapCommand) populateDefaultStoragePools(st *state.State) error {
 	settings := state.NewStateSettings(st)
-	return poolmanager.AddDefaultStoragePools(settings, c.CurrentConfig())
+	return poolmanager.AddDefaultStoragePools(settings)
 }
 
 // populateTools stores uploaded tools in provider storage
diff --git a/storage/poolmanager/defaultpool.go b/storage/poolmanager/defaultpool.go
@@ -17,13 +17,9 @@ func RegisterDefaultStoragePools(pools []*storage.Config) {
 	defaultPools = append(defaultPools, pools...)
 }
 
-type poolConfig interface {
-	DataDir() string
-}
-
 // AddDefaultStoragePools is run at bootstrap and on upgrade to ensure that
 // out of the box storage pools are created.
-func AddDefaultStoragePools(settings SettingsManager, config poolConfig) error {
+func AddDefaultStoragePools(settings SettingsManager) error {
 	pm := NewPoolManager(settings)
 	for _, pool := range defaultPools {
 		if err := addDefaultPool(pm, pool); err != nil {
diff --git a/storage/poolmanager/defaultpool_test.go b/storage/poolmanager/defaultpool_test.go
@@ -21,14 +21,6 @@ type defaultStoragePoolsSuite struct {
 
 var _ = gc.Suite(&defaultStoragePoolsSuite{})
 
-type mockAgentConfig struct {
-	dataDir string
-}
-
-func (mock *mockAgentConfig) DataDir() string {
-	return mock.dataDir
-}
-
 func (s *defaultStoragePoolsSuite) TestDefaultStoragePools(c *gc.C) {
 	s.PatchEnvironment(osenv.JujuFeatureFlagEnvKey, "storage")
 	featureflag.SetFlagsFromEnvironment(osenv.JujuFeatureFlagEnvKey)
@@ -40,7 +32,7 @@ func (s *defaultStoragePoolsSuite) TestDefaultStoragePools(c *gc.C) {
 	poolmanager.RegisterDefaultStoragePools(defaultPools)
 
 	settings := state.NewStateSettings(s.State)
-	err = poolmanager.AddDefaultStoragePools(settings, &mockAgentConfig{dataDir: s.DataDir()})
+	err = poolmanager.AddDefaultStoragePools(settings)
 	c.Assert(err, jc.ErrorIsNil)
 	pm := poolmanager.NewPoolManager(settings)
 	for _, pool := range defaultPools {
diff --git a/upgrades/steps123.go b/upgrades/steps123.go
@@ -20,7 +20,7 @@ func stateStepsFor123() []Step {
 				description: "add default storage pools",
 				targets:     []Target{DatabaseMaster},
 				run: func(context Context) error {
-					return addDefaultStoragePools(context.State(), context.AgentConfig())
+					return addDefaultStoragePools(context.State())
 				},
 			},
 		)
diff --git a/upgrades/storage.go b/upgrades/storage.go
@@ -4,12 +4,11 @@
 package upgrades
 
 import (
-	"github.com/juju/juju/agent"
 	"github.com/juju/juju/state"
 	"github.com/juju/juju/storage/poolmanager"
 )
 
-func addDefaultStoragePools(st *state.State, agentConfig agent.Config) error {
+func addDefaultStoragePools(st *state.State) error {
 	settings := state.NewStateSettings(st)
-	return poolmanager.AddDefaultStoragePools(settings, agentConfig)
+	return poolmanager.AddDefaultStoragePools(settings)
 }
diff --git a/upgrades/storage_test.go b/upgrades/storage_test.go
@@ -26,9 +26,9 @@ func (s *defaultStoragePoolsSuite) TestDefaultStoragePools(c *gc.C) {
 	s.PatchEnvironment(osenv.JujuFeatureFlagEnvKey, "storage")
 	featureflag.SetFlagsFromEnvironment(osenv.JujuFeatureFlagEnvKey)
 
-	err := upgrades.AddDefaultStoragePools(s.State, &mockAgentConfig{dataDir: s.DataDir()})
+	err := upgrades.AddDefaultStoragePools(s.State)
 	settings := state.NewStateSettings(s.State)
-	err = poolmanager.AddDefaultStoragePools(settings, &mockAgentConfig{dataDir: s.DataDir()})
+	err = poolmanager.AddDefaultStoragePools(settings)
 	c.Assert(err, jc.ErrorIsNil)
 	pm := poolmanager.NewPoolManager(settings)
 	for _, pName := range []string{"ebs-ssd"} {

Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,7 @@ func (p ProvisionerAPI) machineVolumeParams(m state.Machine) ([]params.VolumeP`
`561`	`561`	`}`
`562`	`562`
`563`	`563`	`// storageConfig returns the provider type and config attributes for the`
`564`		`-// specified poolName. If no such pool exists, assume poolName is`
	`564`	`+// specified poolName. If no such pool exists, we check to see if poolName is`
`565`	`565`	`// actually a provider type, in which case config will be empty.`
`566`	`566`	`func storageConfig(st *state.State, poolName string) (storage.ProviderType, map[string]interface{}, error) {`
`567`	`567`	`pm := poolmanager.NewPoolManager(state.NewStateSettings(st))`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ func (c *BootstrapCommand) startMongo(addrs []network.Address, agentConfig agent`
`293`	`293`	`// populateDefaultStoragePools creates the default storage pools.`
`294`	`294`	`func (c BootstrapCommand) populateDefaultStoragePools(st state.State) error {`
`295`	`295`	`settings := state.NewStateSettings(st)`
`296`		`- return poolmanager.AddDefaultStoragePools(settings, c.CurrentConfig())`
	`296`	`+ return poolmanager.AddDefaultStoragePools(settings)`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`// populateTools stores uploaded tools in provider storage`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ func stateStepsFor123() []Step {`
`20`	`20`	`description: "add default storage pools",`
`21`	`21`	`targets: []Target{DatabaseMaster},`
`22`	`22`	`run: func(context Context) error {`
`23`		`- return addDefaultStoragePools(context.State(), context.AgentConfig())`
	`23`	`+ return addDefaultStoragePools(context.State())`
`24`	`24`	`},`
`25`	`25`	`},`
`26`	`26`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,11 @@`
`4`	`4`	`package upgrades`
`5`	`5`
`6`	`6`	`import (`
`7`		`- "github.com/juju/juju/agent"`
`8`	`7`	`"github.com/juju/juju/state"`
`9`	`8`	`"github.com/juju/juju/storage/poolmanager"`
`10`	`9`	`)`
`11`	`10`
`12`		`-func addDefaultStoragePools(st *state.State, agentConfig agent.Config) error {`
	`11`	`+func addDefaultStoragePools(st *state.State) error {`
`13`	`12`	`settings := state.NewStateSettings(st)`
`14`		`- return poolmanager.AddDefaultStoragePools(settings, agentConfig)`
	`13`	`+ return poolmanager.AddDefaultStoragePools(settings)`
`15`	`14`	`}`