wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert namespaced facts changes to package/service

Browse source 
fixes #31485
This commit is contained in:
Brian Coca 2017-10-09 15:22:15 -04:00 committed by Toshio Kuratomi
parent 0c64bbcd6f
commit 4e22677e7d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/plugins/action/package.py
View file

@ -43,9 +43,9 @@ class ActionModule(ActionBase):
if module == 'auto': if module == 'auto':
try: try:
if self._task.delegate_to: # if we delegate, we should use delegated host's facts if self._task.delegate_to: # if we delegate, we should use delegated host's facts
module = self._templar.template("{{hostvars['%s']['ansible_facts']['ansible_pkg_mgr']}}" % self._task.delegate_to) module = self._templar.template("{{hostvars['%s']['ansible_pkg_mgr']}}" % self._task.delegate_to)
else: else:
module = self._templar.template('{{ansible_facts["ansible_pkg_mgr"]}}') module = self._templar.template('{{ansible_pkg_mgr}}')
except: except:
pass # could not get it from template! pass # could not get it from template!

4
lib/ansible/plugins/action/service.py
View file

@ -42,9 +42,9 @@ class ActionModule(ActionBase):
if module == 'auto': if module == 'auto':
try: try:
if self._task.delegate_to: # if we delegate, we should use delegated host's facts if self._task.delegate_to: # if we delegate, we should use delegated host's facts
module = self._templar.template("{{hostvars['%s']['ansible_facts']['ansible_service_mgr']}}" % self._task.delegate_to) module = self._templar.template("{{hostvars['%s']['ansible_service_mgr']}}" % self._task.delegate_to)
else: else:
module = self._templar.template('{{ansible_facts["ansible_service_mgr"]}}') module = self._templar.template('{{ansible_service_mgr}}')
except: except:
pass # could not get it from template! pass # could not get it from template!