From b731d507c7d161ede0d7856d86d92bc044ef4845 Mon Sep 17 00:00:00 2001 From: Robin Pierre Cordier Date: Mon, 14 Feb 2022 17:54:39 -0500 Subject: [PATCH] Fix: kheops result was too nested --- plugins/lookup/kheops.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/lookup/kheops.py b/plugins/lookup/kheops.py index 31d03e0..b90efb0 100644 --- a/plugins/lookup/kheops.py +++ b/plugins/lookup/kheops.py @@ -55,7 +55,6 @@ DOCUMENTATION = """ description: - Enable or not Jinja rendering default: True - version_added: '2.11' type: bool jinja2_native: description: @@ -65,7 +64,6 @@ DOCUMENTATION = """ - This offers more flexibility than the template module which does not use Jinja2 native types at all. - Mutually exclusive with the convert_data option. default: False - version_added: '2.11' type: bool env: - name: ANSIBLE_JINJA2_NATIVE @@ -113,8 +111,8 @@ class LookupModule(LookupBase): self.set_options(direct=kwargs) - self.process_scope = self.get_option('process_scope') - self.process_results = self.get_option('process_results') + process_scope = self.get_option('process_scope') + process_results = self.get_option('process_results') enable_jinja = kwargs.pop('enable_jinja', self.get_option('enable_jinja')) jinja2_native = kwargs.pop('jinja2_native', self.get_option('jinja2_native')) @@ -140,9 +138,9 @@ class LookupModule(LookupBase): kheops = AnsibleKheops(configs=configs, display=self._display) # Create scope - if self.process_scope == 'vars': + if process_scope == 'vars': scope = kheops.get_scope_from_host_inventory(variables, scope=None) - elif self.process_scope == 'jinja': + elif process_scope == 'jinja': scope = kheops.get_scope_from_jinja(variables, self._templar, scope=None) # Transform dict to list for lookup/queries @@ -164,7 +162,8 @@ class LookupModule(LookupBase): # not to be processed by literal_eval anywhere in Ansible result = NativeJinjaText(result) - ret.append(result) + # Return result + subkey = list(result.keys())[0] + ret.append(result[subkey]) return ret -