| OLD | NEW |
|---|
| 1 package environs | 1 package environs |
| 2 | 2 |
| 3 import ( | 3 import ( |
| 4 "errors" | 4 "errors" |
| 5 "fmt" | 5 "fmt" |
| 6 "io/ioutil" | 6 "io/ioutil" |
| 7 "launchpad.net/goyaml" | 7 "launchpad.net/goyaml" |
| 8 "launchpad.net/juju-core/environs/config" | 8 "launchpad.net/juju-core/environs/config" |
| 9 "launchpad.net/juju-core/state" | 9 "launchpad.net/juju-core/state" |
| 10 "os" | 10 "os" |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 // The returned configuration contains no secret attributes. | 147 // The returned configuration contains no secret attributes. |
| 148 func BootstrapConfig(p EnvironProvider, cfg *config.Config, tools *state.Tools)
(*config.Config, error) { | 148 func BootstrapConfig(p EnvironProvider, cfg *config.Config, tools *state.Tools)
(*config.Config, error) { |
| 149 secrets, err := p.SecretAttrs(cfg) | 149 secrets, err := p.SecretAttrs(cfg) |
| 150 if err != nil { | 150 if err != nil { |
| 151 return nil, err | 151 return nil, err |
| 152 } | 152 } |
| 153 m := cfg.AllAttrs() | 153 m := cfg.AllAttrs() |
| 154 for k, _ := range secrets { | 154 for k, _ := range secrets { |
| 155 delete(m, k) | 155 delete(m, k) |
| 156 } | 156 } |
| 157 // We never want to push admin-secret to the cloud. |
| 158 delete(m, "admin-secret") |
| 157 m["agent-version"] = tools.Number.String() | 159 m["agent-version"] = tools.Number.String() |
| 158 return config.New(m) | 160 return config.New(m) |
| 159 } | 161 } |
| OLD | NEW |
|---|
