From 8e1168bc6361962a31887fd030e3d1fc09f8e76c Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 10 Jan 2023 09:16:15 +0000 Subject: [PATCH] Update variables gathering to use vars/varnames lookups Directly accessing the internal `vars` variable in ansible is not supported and the same functionality is available with the vars and varnames lookups. Note the use of *query() which converts the list returned from query() into a set of positional arguments for the subsequent query, as query does not accept a list. Change-Id: I74931fed262a44b6c3b410f7120ce443123a2268 --- vars/main.yml | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/vars/main.yml b/vars/main.yml index dd9ea8c..86d4a7f 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -14,37 +14,17 @@ # limitations under the License. # Gather CA definitions from hostvars -_pki_ca_defs: |- - {% set _cas = pki_authorities %} - {% set _ca_search_hits = vars.keys() | select('match', '^' ~ pki_search_authorities_pattern ~ '.*') %} - {% for _ca in _ca_search_hits | default([]) %} - {% set _ = _cas.extend(lookup('vars', _ca)) %} - {% endfor %} - {{ _cas | rejectattr('condition', 'false') }} +_pki_ca_candidates: "{{ query('vars', *query('varnames', '^' ~ pki_search_authorities_pattern)) | flatten(levels=1) }}" +_pki_ca_defs: "{{ pki_authorities | union(_pki_ca_candidates) | rejectattr('condition', 'false') }}" # Gather CA installation definitions from hostvars -_pki_install_ca_defs: |- - {% set _cas = pki_install_ca %} - {% set _ca_search_hits = vars.keys() | select('match', '^' ~ pki_search_install_ca_pattern ~ '.*') %} - {% for _ca in _ca_search_hits | default([]) %} - {% set _ = _cas.extend(lookup('vars', _ca)) %} - {% endfor %} - {{ _cas | rejectattr('condition', 'false') }} +_pki_install_ca_candidates: "{{ query('vars', *query('varnames', '^' ~ pki_search_install_ca_pattern)) | flatten(levels=1) }}" +_pki_install_ca_defs: "{{ pki_install_ca | union(_pki_install_ca_candidates) | rejectattr('condition', 'false') }}" # Gather certificate definitions from hostvars -_pki_certificates_defs: | - {% set _certs = pki_certificates %} - {% set _cert_search_hits = vars.keys() | select('match', '^' ~ pki_search_certificates_pattern ~ '.*') %} - {% for _cert in _cert_search_hits | default([]) %} - {% set _ = _certs.extend(lookup('vars', _cert)) %} - {% endfor %} - {{ _certs | rejectattr('condition', 'false') }} +_pki_certificates_candidates: "{{ query('vars', *query('varnames', '^' ~ pki_search_certificates_pattern)) | flatten(levels=1) }}" +_pki_certificates_defs: "{{ pki_certificates | union(_pki_certificates_candidates) | rejectattr('condition', 'false') }}" # Gather certificate installation definitions from hostvars -_pki_install_certificates_defs: | - {% set _certs = pki_install_certificates %} - {% set _cert_search_hits = vars.keys() | select('match', '^' ~ pki_search_install_certificates_pattern ~ '.*') %} - {% for _cert in _cert_search_hits | default([]) %} - {% set _ = _certs.extend(lookup('vars', _cert)) %} - {% endfor %} - {{ _certs | rejectattr('condition', 'false') }} +_pki_install_certificates_candidates: "{{ query('vars', *query('varnames', '^' ~ pki_search_install_certificates_pattern)) | flatten(levels=1) }}" +_pki_install_certificates_defs: "{{ pki_install_certificates | union(_pki_install_certificates_candidates) | rejectattr('condition', 'false') }}"