pro-barbu-foss/ansible-collection-kheops
pro-barbu-foss/ansible-collection-kheops
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: kheops result was too nested

Browse Source
This commit is contained in:
Robin Pierre Cordier 2022-02-14 17:54:39 -05:00
parent 8b27f60e04
commit b731d507c7
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/lookup/kheops.py
View File

@ -55,7 +55,6 @@ DOCUMENTATION = """
description: description:
- Enable or not Jinja rendering - Enable or not Jinja rendering
default: True default: True
version_added: '2.11'
type: bool type: bool
jinja2_native: jinja2_native:
description: description:
@ -65,7 +64,6 @@ DOCUMENTATION = """
- This offers more flexibility than the template module which does not use Jinja2 native types at all. - This offers more flexibility than the template module which does not use Jinja2 native types at all.
- Mutually exclusive with the convert_data option. - Mutually exclusive with the convert_data option.
default: False default: False
version_added: '2.11'
type: bool type: bool
env: env:
- name: ANSIBLE_JINJA2_NATIVE - name: ANSIBLE_JINJA2_NATIVE
@ -113,8 +111,8 @@ class LookupModule(LookupBase):
self.set_options(direct=kwargs) self.set_options(direct=kwargs)
self.process_scope = self.get_option('process_scope') process_scope = self.get_option('process_scope')
self.process_results = self.get_option('process_results') process_results = self.get_option('process_results')
enable_jinja = kwargs.pop('enable_jinja', self.get_option('enable_jinja')) enable_jinja = kwargs.pop('enable_jinja', self.get_option('enable_jinja'))
jinja2_native = kwargs.pop('jinja2_native', self.get_option('jinja2_native')) 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) kheops = AnsibleKheops(configs=configs, display=self._display)
# Create scope # Create scope
if self.process_scope == 'vars': if process_scope == 'vars':
scope = kheops.get_scope_from_host_inventory(variables, scope=None) 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) scope = kheops.get_scope_from_jinja(variables, self._templar, scope=None)
# Transform dict to list for lookup/queries # Transform dict to list for lookup/queries
@ -164,7 +162,8 @@ class LookupModule(LookupBase):
# not to be processed by literal_eval anywhere in Ansible # not to be processed by literal_eval anywhere in Ansible
result = NativeJinjaText(result) result = NativeJinjaText(result)
ret.append(result) # Return result
subkey = list(result.keys())[0]
ret.append(result[subkey])
return ret return ret