a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #4239 merge injects with new vars loaded from files

pull/4420/head
James Tanner 2014-03-20 13:12:33 -04:00
parent d327e3d11a
commit 95c79ad483
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/playbook/play.py
View File

@ -777,6 +777,7 @@ class Play(object):
if self._has_vars_in(filename2) and not self._has_vars_in(filename3): if self._has_vars_in(filename2) and not self._has_vars_in(filename3):
# this filename has variables in it that were fact specific # this filename has variables in it that were fact specific
# so it needs to be loaded into the per host SETUP_CACHE # so it needs to be loaded into the per host SETUP_CACHE
data = utils.combine_vars(inject, data)
self.playbook.SETUP_CACHE[host].update(data) self.playbook.SETUP_CACHE[host].update(data)
self.playbook.callbacks.on_import_for_host(host, filename4) self.playbook.callbacks.on_import_for_host(host, filename4)
elif not self._has_vars_in(filename4): elif not self._has_vars_in(filename4):
@ -809,6 +810,7 @@ class Play(object):
if host is not None and self._has_vars_in(filename2) and not self._has_vars_in(filename3): if host is not None and self._has_vars_in(filename2) and not self._has_vars_in(filename3):
# running a host specific pass and has host specific variables # running a host specific pass and has host specific variables
# load into setup cache # load into setup cache
new_vars = utils.combine_vars(inject, new_vars)
self.playbook.SETUP_CACHE[host] = utils.combine_vars( self.playbook.SETUP_CACHE[host] = utils.combine_vars(
self.playbook.SETUP_CACHE[host], new_vars) self.playbook.SETUP_CACHE[host], new_vars)
self.playbook.callbacks.on_import_for_host(host, filename4) self.playbook.callbacks.on_import_for_host(host, filename4)