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

Inventory: fix logic mistake in loading/retrieving variables for groups

Browse source
This commit is contained in:
Serge van Ginderachter 2014-08-19 14:55:57 +02:00
parent 47f4dec676
commit a2cfe8770b
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/inventory/__init__.py
View file

@ -146,7 +146,7 @@ class Inventory(object):
# get host vars from host_vars/ files and vars plugins # get host vars from host_vars/ files and vars plugins
for host in self.get_hosts(): for host in self.get_hosts():
host.vars = utils.combine_vars(host.vars, self.get_variables(host.name, vault_password=self._vault_password)) host.vars = utils.combine_vars(host.vars, self.get_host_variables(host.name, vault_password=self._vault_password))
def _match(self, str, pattern_str): def _match(self, str, pattern_str):
@ -429,20 +429,22 @@ class Inventory(object):
if updated is not None: if updated is not None:
vars = utils.combine_vars(vars, updated) vars = utils.combine_vars(vars, updated)
# get group variables set by Inventory Parsers
vars = utils.combine_vars(vars, group.get_variables())
# Read group_vars/ files # Read group_vars/ files
vars = utils.combine_vars(vars, self.get_group_vars(group)) vars = utils.combine_vars(vars, self.get_group_vars(group))
return vars return vars
def get_variables(self, hostname, update_cached=False, vault_password=None): def get_variables(self, hostname, update_cached=False, vault_password=None):
return self.get_host(hostname).get_variables()
def get_host_variables(self, hostname, update_cached=False, vault_password=None):
if hostname not in self._vars_per_host or update_cached: if hostname not in self._vars_per_host or update_cached:
self._vars_per_host[hostname] = self._get_variables(hostname, vault_password=vault_password) self._vars_per_host[hostname] = self._get_host_variables(hostname, vault_password=vault_password)
return self._vars_per_host[hostname] return self._vars_per_host[hostname]
def _get_variables(self, hostname, vault_password=None): def _get_host_variables(self, hostname, vault_password=None):
host = self.get_host(hostname) host = self.get_host(hostname)
if host is None: if host is None:
@ -466,9 +468,6 @@ class Inventory(object):
if updated is not None: if updated is not None:
vars = utils.combine_vars(vars, updated) vars = utils.combine_vars(vars, updated)
# get host variables set by Inventory Parsers
vars = utils.combine_vars(vars, host.get_variables())
# still need to check InventoryParser per host vars # still need to check InventoryParser per host vars
# which actually means InventoryScript per host, # which actually means InventoryScript per host,
# which is not performant # which is not performant