| Index: environs/dummy/environs.go |
| === modified file 'environs/dummy/environs.go' |
| --- environs/dummy/environs.go 2012-10-10 13:12:24 +0000 |
| +++ environs/dummy/environs.go 2012-10-11 10:54:02 +0000 |
| @@ -28,6 +28,7 @@ |
| "launchpad.net/juju-core/schema" |
| "launchpad.net/juju-core/state" |
| "launchpad.net/juju-core/testing" |
| + "launchpad.net/juju-core/trivial" |
| "launchpad.net/juju-core/version" |
| "net" |
| "net/http" |
| @@ -396,12 +397,17 @@ |
| info := stateInfo() |
| cfg, err := environs.BootstrapConfig(&providerInstance, e.ecfg().Config, tools) |
| if err != nil { |
| - return err |
| + return fmt.Errorf("cannot make bootstrap config: %v", err) |
| } |
| st, err := state.Initialize(info, cfg) |
| if err != nil { |
| panic(err) |
| } |
| + if password := e.Config().AdminSecret(); password != "" { |
| + if err := st.SetAdminPassword(trivial.PasswordHash(password)); err != nil { |
| + return err |
| + } |
| + } |
| if err := st.Close(); err != nil { |
| panic(err) |
| } |
