revert namespaced facts changes to package/service

fixes #31485
7 years ago · 4e22677e7d
parent 0c64bbcd6f
commit 4e22677e7d
2 changed files with 4 additions and 4 deletions
--- 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!

--- 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!