diff options
author | Seth Vidal <skvidal@fedoraproject.org> | 2012-04-10 13:51:58 -0400 |
---|---|---|
committer | Seth Vidal <skvidal@fedoraproject.org> | 2012-04-10 13:51:58 -0400 |
commit | 8ae71cc7b133b86fdaf5a508b81cc4b39c34235c (patch) | |
tree | a93af5c0a8f68c305ebf710e21fd4f2cb46e3453 /bin | |
parent | 6749903e5703e88f6e9fc11a649c98fdaffae5c4 (diff) | |
download | ansible-8ae71cc7b133b86fdaf5a508b81cc4b39c34235c.tar.gz |
go back to using a normal optparser to add options instead of the dict
interface.
add very small subclass of OptionParser to sort the options so mdehaan is happy
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/ansible | 23 | ||||
-rwxr-xr-x | bin/ansible-playbook | 15 |
2 files changed, 13 insertions, 25 deletions
diff --git a/bin/ansible b/bin/ansible index 4d0a3b9c4b..268ad37f6e 100755 --- a/bin/ansible +++ b/bin/ansible @@ -47,23 +47,12 @@ class Cli(object): def parse(self): ''' create an options parser for bin/ansible ''' - - options = { - '-a' : dict(long='--args', dest='module_args', - help="module arguments", default=C.DEFAULT_MODULE_ARGS), - '-m' : dict(long='--module-name', dest='module_name', - help="module name to execute", default=C.DEFAULT_MODULE_NAME) - } - - parser = utils.make_parser( - options, - usage='ansible <host-pattern> [options]', - runas_opts=True, - async_opts=True, - output_opts=True, - - ) - + parser = utils.base_parser(constants=C, runas_opts=True, async_opts=True, + output_opts=True, usage='ansible <host-pattern> [options]') + parser.add_option('-a', '--args', dest='module_args', + help="module arguments", default=C.DEFAULT_MODULE_ARGS) + parser.add_option('-m', '--module-name', dest='module_name', + help="module name to execute", default=C.DEFAULT_MODULE_NAME) options, args = parser.parse_args() self.callbacks.options = options diff --git a/bin/ansible-playbook b/bin/ansible-playbook index cb344ad92a..34aafa6b9f 100755 --- a/bin/ansible-playbook +++ b/bin/ansible-playbook @@ -32,14 +32,13 @@ def main(args): ''' run ansible-playbook operations ''' # create parser for CLI options - usage = "ansible-playbook playbook.yml [options]" - options = { - '-e' : dict(long='--extra-vars', dest='extra_vars', - help='pass in extra key=value variables from outside the playbook'), - '-O' : dict(long='--override-hosts', dest="override_hosts", default=None, - help="run playbook against only hosts, ignorning the inventory file") - } - parser = utils.make_parser(options, constants=C, usage=usage) + usage = "ans-playbook playbook.yml" + parser = utils.base_parser(constants=C, usage=usage) + parser.add_option('-e', '--extra-vars', dest='extra_vars', + help='arguments to pass to the inventory script') + parser.add_option('-O', '--override-hosts', dest="override_hosts", default=None, + help="run playbook against these hosts regardless of inventory settings") + options, args = parser.parse_args(args) if len(args) == 0: |