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

Make sure we add host/group vars files when parsing inventory

Browse source 
Also fixes a bug where add_host was not adding the vars files

Fixes #16117
This commit is contained in:
James Cammarata 2016-06-06 02:38:37 -05:00
parent 9936d7355c
commit 7725c58315
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -148,10 +148,12 @@ class Inventory(object):
for g in self.groups: for g in self.groups:
group = self.groups[g] group = self.groups[g]
group.vars = combine_vars(group.vars, self.get_group_variables(group.name)) group.vars = combine_vars(group.vars, self.get_group_variables(group.name))
self.get_group_vars(group)
# set host vars from host_vars/ files and vars plugins # set host vars from host_vars/ files and vars plugins
for host in self.get_hosts(): for host in self.get_hosts():
host.vars = combine_vars(host.vars, self.get_host_variables(host.name)) host.vars = combine_vars(host.vars, self.get_host_variables(host.name))
self.get_host_vars(host)
def _match(self, str, pattern_str): def _match(self, str, pattern_str):
try: try:
@ -703,7 +705,7 @@ class Inventory(object):
found_host_vars = self._find_host_vars_files(self._playbook_basedir) found_host_vars = self._find_host_vars_files(self._playbook_basedir)
if found_host_vars: if found_host_vars:
self._host_vars_files = self._find_host_vars_files(self._playbook_basedir) self._host_vars_files = self._host_vars_files.union(found_host_vars)
# get host vars from host_vars/ files # get host vars from host_vars/ files
for host in self.get_hosts(): for host in self.get_hosts():
self.get_host_vars(host) self.get_host_vars(host)

2
lib/ansible/plugins/strategy/__init__.py
View file

@ -425,6 +425,7 @@ class StrategyBase:
if not new_host: if not new_host:
new_host = Host(name=host_name) new_host = Host(name=host_name)
self._inventory._hosts_cache[host_name] = new_host self._inventory._hosts_cache[host_name] = new_host
self._inventory.get_host_vars(new_host)
allgroup = self._inventory.get_group('all') allgroup = self._inventory.get_group('all')
allgroup.add_host(new_host) allgroup.add_host(new_host)
@ -438,6 +439,7 @@ class StrategyBase:
if not self._inventory.get_group(group_name): if not self._inventory.get_group(group_name):
new_group = Group(group_name) new_group = Group(group_name)
self._inventory.add_group(new_group) self._inventory.add_group(new_group)
self._inventory.get_group_vars(new_group)
new_group.vars = self._inventory.get_group_variables(group_name) new_group.vars = self._inventory.get_group_variables(group_name)
else: else:
new_group = self._inventory.get_group(group_name) new_group = self._inventory.get_group(group_name)