From 4e22677e7d49beeaeb7c7ab531799710873e3081 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Mon, 9 Oct 2017 15:22:15 -0400 Subject: [PATCH] revert namespaced facts changes to package/service fixes #31485 --- lib/ansible/plugins/action/package.py | 4 ++-- 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 4a203784977..97660028f91 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 d18c3fc4ebc..dd0c7965398 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!