internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove extra_vars tests

Browse Source
This commit is contained in:
Michael DeHaan
2012-04-16 23:03:04 -04:00
parent b24ec71ca3
commit 9ce27be878
6 changed files with 13 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/ansible/inventory.py
View File

@@ -32,7 +32,7 @@ class Inventory(object):
systems, or a script that will be called with --list or --host.
"""
def __init__(self, host_list=C.DEFAULT_HOST_LIST, extra_vars=None):
def __init__(self, host_list=C.DEFAULT_HOST_LIST):
self._restriction = None
self._variables = {}
@@ -50,7 +50,7 @@ class Inventory(object):
self.inventory_file = os.path.abspath(inventory_file)
if os.access(self.inventory_file, os.X_OK):
self.host_list, self.groups = self._parse_from_script(extra_vars)
self.host_list, self.groups = self._parse_from_script()
self._is_script = True
else:
self.host_list, self.groups = self._parse_from_file()
@@ -78,7 +78,7 @@ class Inventory(object):
""" Do not restrict list operations """
self._restriction = None
def get_variables(self, host, extra_vars=None):
def get_variables(self, host):
""" Return the variables associated with this host. """
if host in self._variables:
@@ -87,7 +87,7 @@ class Inventory(object):
if not self._is_script:
return {}
return self._get_variables_from_script(host, extra_vars)
return self._get_variables_from_script(host)
# *****************************************************
@@ -126,7 +126,7 @@ class Inventory(object):
# *****************************************************
def _parse_from_script(self, extra_vars=None):
def _parse_from_script(self):
''' evaluate a script that returns list of hosts by groups '''
results = []
@@ -134,9 +134,6 @@ class Inventory(object):
cmd = [self.inventory_file, '--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()
rc = cmd.returncode
@@ -241,14 +238,11 @@ class Inventory(object):
raise AnsibleError("Unknown item in inventory: %s"%(item))
def _get_variables_from_script(self, host, extra_vars=None):
def _get_variables_from_script(self, host):
''' support per system variabes from external variable scripts, see web docs '''
cmd = [self.inventory_file, '--host', host]
if extra_vars:
cmd.extend(['--extra-vars', extra_vars])
cmd = subprocess.Popen(cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,