diff options
| author | Brian Coca <brian.coca+git@gmail.com> | 2017-10-09 15:22:15 -0400 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2017-10-09 16:32:27 -0700 |
| commit | a59cbe5e11ab88af7a81f8d7f588997435356c87 (patch) | |
| tree | a990b8eb677f54213cb2a7033da868ca3bb32268 /lib/ansible | |
| parent | 982e15d79e77c7baad2c56ef92409d07ec26016e (diff) | |
| download | ansible-a59cbe5e11ab88af7a81f8d7f588997435356c87.tar.gz | |
revert namespaced facts changes to package/service
fixes #31485
(cherry picked from commit 4e22677e7d49beeaeb7c7ab531799710873e3081)
Diffstat (limited to 'lib/ansible')
| -rw-r--r-- | lib/ansible/plugins/action/package.py | 4 | ||||
| -rw-r--r-- | lib/ansible/plugins/action/service.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/ansible/plugins/action/package.py b/lib/ansible/plugins/action/package.py index 4a20378497..97660028f9 100644 --- a/lib/ansible/plugins/action/package.py +++ b/lib/ansible/plugins/action/package.py @@ -43,9 +43,9 @@ class ActionModule(ActionBase): if module == 'auto': try: 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: - module = self._templar.template('{{ansible_facts["ansible_pkg_mgr"]}}') + module = self._templar.template('{{ansible_pkg_mgr}}') except: pass # could not get it from template! diff --git a/lib/ansible/plugins/action/service.py b/lib/ansible/plugins/action/service.py index d18c3fc4eb..dd0c796539 100644 --- a/lib/ansible/plugins/action/service.py +++ b/lib/ansible/plugins/action/service.py @@ -42,9 +42,9 @@ class ActionModule(ActionBase): if module == 'auto': try: 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: - module = self._templar.template('{{ansible_facts["ansible_service_mgr"]}}') + module = self._templar.template('{{ansible_service_mgr}}') except: pass # could not get it from template! |