From b5214dfd5e1644422bd1b3c4717cb0db86681630 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 1 Mar 2021 12:20:34 +0000 Subject: [PATCH] Gather minimal facts for dynamic_address_fact Currently this code assumes that there are facts available for all network interfaces on the host. This may be hundreds of interfaces for compute or network nodes. If the OSA fact gathering is switched to be minimal to increase deployment performance then is is necessary to gather information about the interface to take the dynamiclly selected IP address from. This patch adds a network facts gathering task which is filtered to return only facts about the network interfaces specified in container_networks, or in a new override dynamic_address_gather_filter. The network facts are also now accessed via ansible_facts[] instead of the hostvar ansible_. Change-Id: Ib6c117b27b84d911baad8f85ec3128965dd4c6c2 --- .../common-tasks/dynamic-address-fact.yml | 10 +++++++++- ...ynamic-address-facts-988abe70b2a5df90.yaml | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/dynamic-address-facts-988abe70b2a5df90.yaml diff --git a/playbooks/common-tasks/dynamic-address-fact.yml b/playbooks/common-tasks/dynamic-address-fact.yml index f8087fab87..0a42190df2 100644 --- a/playbooks/common-tasks/dynamic-address-fact.yml +++ b/playbooks/common-tasks/dynamic-address-fact.yml @@ -13,13 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. +- name: Gathering facts for {{ network_address }} interface on metal hosts + setup: + gather_subset: "!all,network" + filter: "{{ dynamic_address_gather_filter | default(('ansible_' ~ container_networks[network_address]['bridge']) | replace('-','_')) }}" + when: + - is_metal + - (dynamic_address_gather_filter is defined) or (container_networks[network_address] is defined and container_networks[network_address]['bridge'] is defined) + - name: Set IP to use for {{ network_address }} set_fact: "{{ network_address }}={{ hostvars[inventory_hostname] | json_query(query) }}" vars: query: "{{ is_metal | ternary(metal_query, non_metal_query) }}" non_metal_query: "container_networks.{{ network_address }}.address || ansible_host" find_bridge: "container_networks.{{ network_address }}.bridge" - metal_query: "\"ansible_{{ hostvars[inventory_hostname] | json_query(find_bridge) | replace('-','_') }}\".ipv4.address || {{ non_metal_query }}" + metal_query: "ansible_facts.\"{{ hostvars[inventory_hostname] | json_query(find_bridge) | replace('-','_') }}\".ipv4.address || {{ non_metal_query }}" tags: - common-address - always diff --git a/releasenotes/notes/dynamic-address-facts-988abe70b2a5df90.yaml b/releasenotes/notes/dynamic-address-facts-988abe70b2a5df90.yaml new file mode 100644 index 0000000000..fc15b7f9c1 --- /dev/null +++ b/releasenotes/notes/dynamic-address-facts-988abe70b2a5df90.yaml @@ -0,0 +1,19 @@ +--- +features: + - | + Only minimal facts are gathered when calculating the 'dynamic address fact' + for the neutron, nova and cinder playbooks. On compute and network nodes + this previously took a significant amount of time, and gathering minimal + facts will speed this up. Facts are instead gathered for interfaces + specified in provider_networks for the storage, overlay and management + networks. +upgrade: + - | + Only minimal facts are gathered when calculating the 'dynamic address fact' + for the neutron, nova and cinder playbooks. If overrides are in use for + setting the neutron tunnel address, or various storage or management + addresses which rely on ansible fact gathering to provide variables of the + form ansible_, it is likley that these facts will no longer be + gathered by default. The new variable dynamic_address_gather_filter is + available to specify a shell-style (fnmatch) wildcard to specify the set + of facts gathered early in the neutron/nova/cinder playbooks.