From c05f5770051ad1a369b2d16ac1b0ff9a0b2e9419 Mon Sep 17 00:00:00 2001 From: Pavlo Shchelokovskyy Date: Mon, 14 Apr 2014 16:14:19 +0300 Subject: [PATCH] Remove unused arguments for stack-preview command --create-timeout/--timeout and --disable-rollback have no meaning in the context of stack-preview, and actually are not used by Heat during stack preview action, so remove them. Change-Id: I1f991eaddf98b0e5c0c3f8b4aaa33947eba53664 Closes-Bug: #1297748 --- heatclient/v1/shell.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py index f2a14ed8..1a82f0c3 100644 --- a/heatclient/v1/shell.py +++ b/heatclient/v1/shell.py @@ -184,15 +184,6 @@ def do_stack_adopt(hc, args): help='URL of template.') @utils.arg('-o', '--template-object', metavar='', help='URL to retrieve template object (e.g from swift)') -@utils.arg('-c', '--create-timeout', metavar='', - type=int, - help='Stack preview timeout in minutes.' - ' DEPRECATED use --timeout instead.') -@utils.arg('-t', '--timeout', metavar='', - type=int, - help='Stack preview timeout in minutes.') -@utils.arg('-r', '--enable-rollback', default=False, action="store_true", - help='Enable rollback on failure') @utils.arg('-P', '--parameters', metavar='', help='Parameter values used to preview the stack. ' 'This can be specified multiple times, or once with parameters ' @@ -210,23 +201,14 @@ def do_stack_preview(hc, args): env_files, env = template_utils.process_environment_and_files( env_path=args.environment_file) - if args.create_timeout: - logger.warning('-c/--create-timeout is deprecated, ' - 'please use -t/--timeout instead') - fields = { 'stack_name': args.name, - 'disable_rollback': not(args.enable_rollback), 'parameters': utils.format_parameters(args.parameters), 'template': template, 'files': dict(list(tpl_files.items()) + list(env_files.items())), 'environment': env } - timeout = args.timeout or args.create_timeout - if timeout: - fields['timeout_mins'] = timeout - stack = hc.stacks.preview(**fields) formatters = { 'description': utils.text_wrap_formatter,