diff options
author | JUN JIE NAN <nanjj@cn.ibm.com> | 2013-09-03 17:51:28 +0800 |
---|---|---|
committer | JUN JIE NAN <nanjj@cn.ibm.com> | 2013-09-06 09:43:24 +0800 |
commit | f40e4b783c8fbb7024e54131cf69cc1892e572c0 (patch) | |
tree | dc12e9fc33e2fc3019a029505b4a843311f62cca | |
parent | 2044ef239d59ba8b3c29172ffca99cb3070a6359 (diff) | |
download | heat-cfntools-f40e4b783c8fbb7024e54131cf69cc1892e572c0.tar.gz |
Change cfn-signal option --exit to --exit-code
According cfn user guide, the long option of cfn-signal -e should be
--exit-code.
Fixes bug #1220080
Change-Id: Id4e9feefd387a744f5e933aa4e9ea8a6f6f02a7c
-rwxr-xr-x | bin/cfn-signal | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/bin/cfn-signal b/bin/cfn-signal index 29d487b..776c759 100755 --- a/bin/cfn-signal +++ b/bin/cfn-signal @@ -45,11 +45,16 @@ parser.add_argument('-i', '--id', help="the unique id to send back to the WaitCondition", default='00000', required=False) -parser.add_argument('-e', '--exit', +parser.add_argument('-e', '--exit-code', dest="exit_code", help="The exit code from a procecc to interpret", default=None, required=False) +parser.add_argument('--exit', + dest="exit", + help="DEPRECATED! Use -e or --exit-code instead.", + default=None, + required=False) parser.add_argument('url', help='the url to post to') args = parser.parse_args() @@ -64,11 +69,13 @@ file_handler.setFormatter(logging.Formatter(log_format)) LOG.addHandler(file_handler) LOG.debug('cfn-signal called %s ' % (str(args))) - +if args.exit: + LOG.warning('--exit DEPRECATED! Use -e or --exit-code instead.') status = 'FAILURE' -if args.exit_code: +exit_code = args.exit_code or args.exit +if exit_code: # "exit_code" takes presedence over "success". - if args.exit_code == '0': + if exit_code == '0': status = 'SUCCESS' else: if args.success == 'true': |