juju-deployer

Merge lp:~hazmat/juju-deployer/use-solo-named-config into lp:juju-deployer

  1. use-solo-named-config
  2. Merge into trunk
Proposed by Kapil Thangavelu
Status: Merged
Approved by: Adam Gandelman
Approved revision: 77
Merged at revision: 77
Proposed branch: lp:~hazmat/juju-deployer/use-solo-named-config
Merge into: lp:juju-deployer
Diff against target: 22 lines (+9/-4)
1 file modified
deployer/cli.py (+9/-4)
To merge this branch: bzr merge lp:~hazmat/juju-deployer/use-solo-named-config
Reviewer Review Type Date Requested Status
juju-deployers Pending
Review via email: mp+192014@code.launchpad.net

Description of the change

Allow usage of deployer configs without a named deployment if theres only one. Simplifies common case around juju-gui environment exports.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'deployer/cli.py'
2--- deployer/cli.py 2013-09-11 18:08:41 +0000
3+++ deployer/cli.py 2013-10-21 16:17:27 +0000
4@@ -188,10 +188,15 @@
5
6 # Do something to a deployment
7 if not options.deployment:
8- log.error(
9- "Deployment name must be specified. available: %s", tuple(
10- sorted(config.keys())))
11- sys.exit(1)
12+ # If there's only one option then use it.
13+ if len(config.key()) == 1:
14+ options.deployment = config.keys()[0]
15+ log.info("Using deployment %s", options.deployment)
16+ else:
17+ log.error(
18+ "Deployment name must be specified. available: %s",
19+ tuple(sorted(config.keys())))
20+ sys.exit(1)
21
22 deployment = config.get(options.deployment)
23

Subscribers

People subscribed via source and target branches