Define haproxy fact gathering vars at group rather than task level

Task vars are higher precedence than inventory group vars so
cannot be overidden except in user_variables (ansible extra vars)
which then become a global setting, which is almost certainly
incorrect for this case.

Change-Id: Ie43e339df50adbe8240ffe43159c28f132e50000
This commit is contained in:
Jonathan Rosser 2024-03-28 22:03:45 +00:00
parent 3e2d7afa05
commit dc58e54edf
2 changed files with 10 additions and 8 deletions

View File

@ -126,3 +126,13 @@ haproxy_default_services:
- "{{ haproxy_base_service | combine(haproxy_base_service_overrides | default({})) }}"
- "{{ haproxy_letsencrypt_service | combine(haproxy_letsencrypt_service_overrides | default({})) }}"
- "{{ haproxy_ceph_rgw_service | combine(haproxy_ceph_rgw_service_overrides | default({})) }}"
# ensure correct facts are gathered in haproxy play
# to determine the network gateway to use in keepalived track script
deployment_extra_facts_filter:
- "ansible_processor_*"
- ansible_default_ipv4
deployment_extra_facts_subset:
- '!all'
- hardware
- network

View File

@ -19,14 +19,6 @@
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
vars:
deployment_extra_facts_filter:
- "ansible_processor_*"
- ansible_default_ipv4
deployment_extra_facts_subset:
- '!all'
- hardware
- network
when: osa_gather_facts | default(True)
tags:
- always