From e9a32c11073628937397ff48ef85ad4e698a549f Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Tue, 3 Jul 2018 15:06:23 -0400 Subject: [PATCH] fix vars hostname fallback (#41858) also made it optimistic, rely on exceptions instead of copmlex if chains (cherry picked from commit 11dbed1350b81e7959beb5c55118d3bcce793cd5) --- changelogs/fragments/vars_lk.yml | 2 ++ lib/ansible/plugins/lookup/vars.py | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 changelogs/fragments/vars_lk.yml diff --git a/changelogs/fragments/vars_lk.yml b/changelogs/fragments/vars_lk.yml new file mode 100644 index 00000000000..56f38a35107 --- /dev/null +++ b/changelogs/fragments/vars_lk.yml @@ -0,0 +1,2 @@ +bugfixes: + - correctly check hostvars for vars term https://github.com/ansible/ansible/pull/41819 diff --git a/lib/ansible/plugins/lookup/vars.py b/lib/ansible/plugins/lookup/vars.py index a5e4f09ba52..8932f304c98 100644 --- a/lib/ansible/plugins/lookup/vars.py +++ b/lib/ansible/plugins/lookup/vars.py @@ -78,15 +78,15 @@ class LookupModule(LookupBase): raise AnsibleError('Invalid setting identifier, "%s" is not a string, its a %s' % (term, type(term))) try: - if term in myvars: + try: value = myvars[term] - elif 'hostvars' in myvars and term in myvars['hostvars']: - # maybe it is a host var? - value = myvars['hostvars'][term] - else: - raise AnsibleUndefinedVariable('No variable found with this name: %s' % term) - ret.append(self._templar.template(value, fail_on_undefined=True)) + except KeyError: + try: + value = myvars['hostvars'][myvars['inventory_hostname']][term] + except KeyError: + raise AnsibleUndefinedVariable('No variable found with this name: %s' % term) + ret.append(self._templar.template(value, fail_on_undefined=True)) except AnsibleUndefinedVariable: if default is not None: ret.append(default)