ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-28 11:10:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

--extra-vars option for ansible-playbook

Browse source 
Conflicts:

	lib/ansible/playbook.py

Removed unneccessary shlex and replaced with basic split, some repurcussions in runner
that can be eliminated once we consistently pass args as a string (soon).
This commit is contained in:
Michael DeHaan 2012-03-30 22:28:10 -04:00
parent 6db87a5018
commit f11de2f5c9
4 changed files with 51 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lib/ansible/runner.py
View file

@ -74,7 +74,7 @@ class Runner(object):
remote_user=C.DEFAULT_REMOTE_USER, remote_pass=C.DEFAULT_REMOTE_PASS,
remote_port=C.DEFAULT_REMOTE_PORT, background=0, basedir=None, setup_cache=None,
transport='paramiko', conditional='True', groups={}, callbacks=None, verbose=False,
sudo=False):
sudo=False, extra_vars=None):
if setup_cache is None:
setup_cache = {}
@ -101,6 +101,7 @@ class Runner(object):
self.forks = int(forks)
self.pattern = pattern
self.module_args = module_args
self.extra_vars = extra_vars
self.timeout = timeout
self.verbose = verbose
self.remote_user = remote_user
@ -143,14 +144,17 @@ class Runner(object):
# *****************************************************
@classmethod
def parse_hosts_from_script(cls, host_list):
def parse_hosts_from_script(cls, host_list, extra_vars):
''' evaluate a script that returns list of hosts by groups '''
results = []
groups = dict(ungrouped=[])
host_list = os.path.abspath(host_list)
cls._external_variable_script = host_list
cmd = subprocess.Popen([host_list], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False)
cmd = [host_list, '--list']
if extra_vars:
cmd.extend(['--extra-vars', extra_vars])
cmd = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False)
out, err = cmd.communicate()
try:
groups = utils.json_loads(out)
@ -165,7 +169,7 @@ class Runner(object):
# *****************************************************
@classmethod
def parse_hosts(cls, host_list, override_hosts=None):
def parse_hosts(cls, host_list, override_hosts=None, extra_vars=None):
''' parse the host inventory file, returns (hosts, groups) '''
if override_hosts is not None:
@ -183,7 +187,7 @@ class Runner(object):
if not os.access(host_list, os.X_OK):
return Runner.parse_hosts_from_regular_file(host_list)
else:
return Runner.parse_hosts_from_script(host_list)
return Runner.parse_hosts_from_script(host_list, extra_vars)
# *****************************************************
@ -275,7 +279,12 @@ class Runner(object):
''' support per system variabes from external variable scripts, see web docs '''
host = conn.host
cmd = subprocess.Popen([Runner._external_variable_script, host],
cmd = [Runner._external_variable_script, '--host', host]
if self.extra_vars:
cmd.extend(['--extra-vars', self.extra_vars])
cmd = subprocess.Popen(cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
shell=False
@ -384,9 +393,13 @@ class Runner(object):
''' transfer & execute a module that is not 'copy' or 'template' '''
# shell and command are the same module
# FIXME: keep these args as strings as long as possible...
if module_name == 'shell':
module_name = 'command'
self.module_args.append("#USE_SHELL")
if type(self.module_args) == list:
self.module_args.append("#USE_SHELL")
else:
self.module_args += " #USE_SHELL"
module = self._transfer_module(conn, tmp, module_name)
(result, executed) = self._execute_module(conn, tmp, module, self.module_args)
@ -406,7 +419,12 @@ class Runner(object):
module_args = self.module_args
if module_name == 'shell':
module_name = 'command'
module_args.append("#USE_SHELL")
# FIXME: this will become cleaner once we keep args as a string
# throughout the app
if type(module_args) == list:
module_args.append("#USE_SHELL")
else:
module_args += " #USE_SHELL"
async = self._transfer_module(conn, tmp, 'async_wrapper')
module = self._transfer_module(conn, tmp, module_name)