cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #14251 from bcoca/ansible_pull_once

Browse source 
better fix for ansible-pull inventory handling
This commit is contained in:
Brian Coca 2016-02-02 14:24:50 -05:00
commit c5b4e194fa
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/cli/__init__.py
View file

@ -224,7 +224,7 @@ class CLI(object):
if inventory_opts: if inventory_opts:
parser.add_option('-i', '--inventory-file', dest='inventory', parser.add_option('-i', '--inventory-file', dest='inventory',
help="specify inventory host path (default=%s) or comma separated host list" % C.DEFAULT_HOST_LIST, help="specify inventory host path (default=%s) or comma separated host list." % C.DEFAULT_HOST_LIST,
default=C.DEFAULT_HOST_LIST, action="callback", callback=CLI.expand_tilde, type=str) default=C.DEFAULT_HOST_LIST, action="callback", callback=CLI.expand_tilde, type=str)
parser.add_option('--list-hosts', dest='listhosts', action='store_true', parser.add_option('--list-hosts', dest='listhosts', action='store_true',
help='outputs a list of matching hosts; does not execute anything else') help='outputs a list of matching hosts; does not execute anything else')

11
lib/ansible/cli/pull.py
View file

@ -92,6 +92,9 @@ class PullCLI(CLI):
help='verify GPG signature of checked out commit, if it fails abort running the playbook.' help='verify GPG signature of checked out commit, if it fails abort running the playbook.'
' This needs the corresponding VCS module to support such an operation') ' This needs the corresponding VCS module to support such an operation')
# for pull we don't wan't a default
self.parser.set_defaults(inventory=None)
self.options, self.args = self.parser.parse_args(self.args[1:]) self.options, self.args = self.parser.parse_args(self.args[1:])
if not self.options.dest: if not self.options.dest:
@ -136,8 +139,8 @@ class PullCLI(CLI):
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) ])
# Attempt to use the inventory passed in as an argument # Attempt to use the inventory passed in as an argument
# It might not yet have been downloaded so use localhost if note # It might not yet have been downloaded so use localhost as default
if not self.options.inventory or not os.path.exists(self.options.inventory): if not self.options.inventory or ( ',' not in self.options.inventory and not os.path.exists(self.options.inventory)):
inv_opts = 'localhost,' inv_opts = 'localhost,'
else: else:
inv_opts = self.options.inventory inv_opts = self.options.inventory
@ -166,7 +169,7 @@ class PullCLI(CLI):
bin_path = os.path.dirname(os.path.abspath(sys.argv[0])) bin_path = os.path.dirname(os.path.abspath(sys.argv[0]))
# hardcode local and inventory/host as this is just meant to fetch the repo # hardcode local and inventory/host as this is just meant to fetch the repo
cmd = '%s/ansible -i "localhost," -c local %s -m %s -a "%s" all' % (bin_path, base_opts, self.options.module_name, repo_opts) cmd = '%s/ansible -i "%s" %s -m %s -a "%s" all -l "%s"' % (bin_path, inv_opts, base_opts, self.options.module_name, repo_opts, limit_opts)
for ev in self.options.extra_vars: for ev in self.options.extra_vars:
cmd += ' -e "%s"' % ev cmd += ' -e "%s"' % ev
@ -208,6 +211,8 @@ class PullCLI(CLI):
cmd += ' -t "%s"' % self.options.tags cmd += ' -t "%s"' % self.options.tags
if self.options.subset: if self.options.subset:
cmd += ' -l "%s"' % self.options.subset cmd += ' -l "%s"' % self.options.subset
else:
cmd += ' -l "%s"' % limit_opts
os.chdir(self.options.dest) os.chdir(self.options.dest)