Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(388)

Delta Between Two Patch Sets: provider/local/environprovider.go

Issue 86160043: Error msg for local charm deploy missing series.
Left Patch Set: Created 9 years, 11 months ago
Right Patch Set: Error msg for local charm deploy missing series. Created 9 years, 11 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Right: Side by side diff | Download
« cmd/juju/deploy.go ('K') | « cmd/juju/deploy.go ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
1 // Copyright 2013 Canonical Ltd. 1 // Copyright 2013 Canonical Ltd.
2 // Licensed under the AGPLv3, see LICENCE file for details. 2 // Licensed under the AGPLv3, see LICENCE file for details.
3 3
4 package local 4 package local
5 5
6 import ( 6 import (
7 "fmt" 7 "fmt"
8 "net" 8 "net"
9 "os" 9 "os"
10 "os/user" 10 "os/user"
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 # providers, or if the default port is used by another program. 255 # providers, or if the default port is used by another program.
256 # 256 #
257 # storage-port: 8040 257 # storage-port: 8040
258 258
259 # network-bridge holds the name of the LXC network bridge to use. 259 # network-bridge holds the name of the LXC network bridge to use.
260 # Override if the default LXC network bridge is different. 260 # Override if the default LXC network bridge is different.
261 # 261 #
262 # 262 #
263 # network-bridge: lxcbr0 263 # network-bridge: lxcbr0
264 264
265 # The default series to deploy the state-server and charms on.
266 #
267 # default-series: precise
268
265 `[1:] 269 `[1:]
266 } 270 }
267 271
268 // SecretAttrs implements environs.EnvironProvider.SecretAttrs. 272 // SecretAttrs implements environs.EnvironProvider.SecretAttrs.
269 func (environProvider) SecretAttrs(cfg *config.Config) (map[string]string, error ) { 273 func (environProvider) SecretAttrs(cfg *config.Config) (map[string]string, error ) {
270 // don't have any secret attrs 274 // don't have any secret attrs
271 return nil, nil 275 return nil, nil
272 } 276 }
273 277
274 func (p environProvider) newConfig(cfg *config.Config) (*environConfig, error) { 278 func (p environProvider) newConfig(cfg *config.Config) (*environConfig, error) {
275 valid, err := p.Validate(cfg, nil) 279 valid, err := p.Validate(cfg, nil)
276 if err != nil { 280 if err != nil {
277 return nil, err 281 return nil, err
278 } 282 }
279 return newEnvironConfig(valid, valid.UnknownAttrs()), nil 283 return newEnvironConfig(valid, valid.UnknownAttrs()), nil
280 } 284 }
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b