Commit 24b7c353 by Brian Coca

readjusted limit opts, makes no sense in adhoc when you already specify selection

changed pull to reflect this
parent 845d564d
...@@ -222,12 +222,12 @@ class CLI(object): ...@@ -222,12 +222,12 @@ class CLI(object):
help="specify path(s) to module library (default=%s)" % C.DEFAULT_MODULE_PATH, default=None) help="specify path(s) to module library (default=%s)" % C.DEFAULT_MODULE_PATH, default=None)
parser.add_option('-e', '--extra-vars', dest="extra_vars", action="append", parser.add_option('-e', '--extra-vars', dest="extra_vars", action="append",
help="set additional variables as key=value or YAML/JSON", default=[]) help="set additional variables as key=value or YAML/JSON", default=[])
parser.add_option('-l', '--limit', default=C.DEFAULT_SUBSET, dest='subset',
help='further limit selected hosts to an additional pattern')
if fork_opts: if fork_opts:
parser.add_option('-f','--forks', dest='forks', default=C.DEFAULT_FORKS, type='int', parser.add_option('-f','--forks', dest='forks', default=C.DEFAULT_FORKS, type='int',
help="specify number of parallel processes to use (default=%s)" % C.DEFAULT_FORKS) help="specify number of parallel processes to use (default=%s)" % C.DEFAULT_FORKS)
parser.add_option('-l', '--limit', default=C.DEFAULT_SUBSET, dest='subset',
help='further limit selected hosts to an additional pattern')
if vault_opts: if vault_opts:
parser.add_option('--ask-vault-pass', default=False, dest='ask_vault_pass', action='store_true', parser.add_option('--ask-vault-pass', default=False, dest='ask_vault_pass', action='store_true',
......
...@@ -45,6 +45,7 @@ class AdHocCLI(CLI): ...@@ -45,6 +45,7 @@ class AdHocCLI(CLI):
check_opts=True, check_opts=True,
runtask_opts=True, runtask_opts=True,
vault_opts=True, vault_opts=True,
fork_opts=True,
) )
# options unique to ansible ad-hoc # options unique to ansible ad-hoc
......
...@@ -104,7 +104,7 @@ class PullCLI(CLI): ...@@ -104,7 +104,7 @@ class PullCLI(CLI):
# Build Checkout command # Build Checkout command
# Now construct the ansible command # Now construct the ansible command
limit_opts = 'localhost:%s:127.0.0.1' % socket.getfqdn() limit_opts = 'localhost:%s:127.0.0.1' % socket.getfqdn()
base_opts = '-c local --limit "%s"' % limit_opts base_opts = '-c local "%s"' % limit_opts
if self.options.verbosity > 0: if self.options.verbosity > 0:
base_opts += ' -%s' % ''.join([ "v" for x in range(0, self.options.verbosity) ]) base_opts += ' -%s' % ''.join([ "v" for x in range(0, self.options.verbosity) ])
...@@ -132,7 +132,7 @@ class PullCLI(CLI): ...@@ -132,7 +132,7 @@ class PullCLI(CLI):
raise AnsibleOptionsError(("module '%s' not found.\n" % self.options.module_name)) raise AnsibleOptionsError(("module '%s' not found.\n" % self.options.module_name))
bin_path = os.path.dirname(os.path.abspath(sys.argv[0])) bin_path = os.path.dirname(os.path.abspath(sys.argv[0]))
cmd = '%s/ansible localhost -i "%s" %s -m %s -a "%s"' % ( cmd = '%s/ansible -i "%s" %s -m %s -a "%s"' % (
bin_path, inv_opts, base_opts, self.options.module_name, repo_opts bin_path, inv_opts, base_opts, self.options.module_name, repo_opts
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment