Skip to content

Commit

Permalink
fix: facts being gathered unnecessarily
Browse files Browse the repository at this point in the history
Cause: The comparison of the present facts with the required facts is
being done on unsorted lists.

Consequence: The comparison may fail if the only difference is the
order.  Facts are gathered unnecessarily.

Fix: Use `difference` which works no matter what the order is.  Ensure
that the fact gathering subsets used are the absolute minimum required.

Result: The role gathers only the facts it requires, and does
not unnecessarily gather facts.

Signed-off-by: Rich Megginson <[email protected]>
  • Loading branch information
richm committed Jul 13, 2023
1 parent bfdf66c commit 63aa2bf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tasks/set_vars.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
- name: Ensure ansible_facts used by role
setup:
gather_subset: min
when: not ansible_facts.keys() | list |
intersect(__ssh_required_facts) == __ssh_required_facts
gather_subset: "{{ __ssh_required_facts_subsets }}"
when: __ssh_required_facts |
difference(ansible_facts.keys() | list) | length > 0

- name: Set platform/version specific variables
include_vars: "{{ __vars_file }}"
Expand Down
6 changes: 6 additions & 0 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,9 @@ __ssh_required_facts:
- distribution_major_version
- distribution_version
- os_family

# the subsets of ansible_facts that need to be gathered in case any of the
# facts in required_facts is missing; see the documentation of
# the 'gather_subset' parameter of the 'setup' module
__ssh_required_facts_subsets: "{{ ['!all', '!min'] +
__ssh_required_facts }}"

0 comments on commit 63aa2bf

Please sign in to comment.