Merge lp:~marcoceppi/juju-deployer/plugin-support into lp:juju-deployer/darwin

[Marco Ceppi]

[Kapil Thangavelu (hazmat)]

Thanks, lgtm

On Thu, Aug 15, 2013 at 12:18 PM, Marco Ceppi <email address hidden> wrote:

> Marco Ceppi has proposed merging
> lp:~marcoceppi/juju-deployer/plugin-support into lp:juju-deployer/darwin.
>
> Requested reviews:
> juju-deployers (juju-deployers)
> Related bugs:
> Bug #1212740 in juju-deployer: "no --description option produces poor UX
> with juju-core plugins"
> https://bugs.launchpad.net/juju-deployer/+bug/1212740
>
> For more details, see:
>
> https://code.launchpad.net/~marcoceppi/juju-deployer/plugin-support/+merge/180377
> --
>
> https://code.launchpad.net/~marcoceppi/juju-deployer/plugin-support/+merge/180377
> Your team juju-deployers is requested to review the proposed merge of
> lp:~marcoceppi/juju-deployer/plugin-support into lp:juju-deployer/darwin.
>
> === modified file 'deployer/cli.py'
> --- deployer/cli.py 2013-07-30 23:39:51 +0000
> +++ deployer/cli.py 2013-08-15 16:17:49 +0000
> @@ -101,6 +101,8 @@
> help=('Number of seconds to wait before checking for '
> 'relation errors after all relations have been added '
> 'and subordinates started. (default: 60)'))
> + parser.add_argument("--description", help=argparse.SUPPRESS,
> + action="store_true")
> parser.add_argument("deployment", nargs="?")
> return parser
>
> @@ -119,6 +121,11 @@
> parser = setup_parser()
> options = parser.parse_args()
>
> + if options.description:
> + print "tool for setting up complex and offline juju deployments "
> + \
> + "across any provider"
> + sys.exit(0)
> +
> # Debug implies watching and verbose
> if options.debug:
> options.watch = options.verbose = True
>
>
>

=== modified file 'deployer/cli.py'
--- deployer/cli.py	2013-07-30 23:39:51 +0000
+++ deployer/cli.py	2013-08-15 16:17:49 +0000
@@ -101,6 +101,8 @@
         help=('Number of seconds to wait before checking for '
               'relation errors after all relations have been added '
               'and subordinates started. (default: 60)'))
+    parser.add_argument("--description", help=argparse.SUPPRESS,
+                        action="store_true")
     parser.add_argument("deployment", nargs="?")
     return parser
 
@@ -119,6 +121,11 @@
     parser = setup_parser()
     options = parser.parse_args()
 
+    if options.description:
+        print "tool for setting up complex and offline juju deployments " + \
+              "across any provider"
+        sys.exit(0)
+
     # Debug implies watching and verbose
     if options.debug:
         options.watch = options.verbose = True