openstack/openstack-ansible
Code Issues Proposed changes

Fix error in dynamic-address-fact task

Browse Source 
When a dynamic_address_gather_filter is set and the inventory
data does not generate the dynamic inventory variable
container_networks[network_address]['bridge'], the task will
fail, as even though dynamic_address_gather_filter is defined
the jinja template will still try to evaluate
container_networks[network_address]['bridge'].

This patch fixes this by setting a default value if
container_networks[network_address]['bridge'] is not defined

Change-Id: I39082bee2435781d87f653e66fd55a92397c5572
This commit is contained in:
James Gibson 2021-10-20 17:03:11 +01:00
parent 78d9a8596a
commit 3504694b4a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/common-tasks/dynamic-address-fact.yml
View File

@ -16,10 +16,12 @@
- name: Gathering facts for {{ network_address }} interface on metal hosts - name: Gathering facts for {{ network_address }} interface on metal hosts
setup: setup:
gather_subset: "!all,network" gather_subset: "!all,network"
filter: "{{ dynamic_address_gather_filter | default(('ansible_' ~ container_networks[network_address]['bridge']) | replace('-','_')) }}" filter: "{{ dynamic_address_gather_filter | default(('ansible_' ~ default_network_interface_name) | replace('-','_')) }}"
vars:
default_network_interface_name: "{{ container_networks[network_address]['bridge'] | default }}"
when: when:
- is_metal - is_metal
- (dynamic_address_gather_filter is defined) or (container_networks[network_address] is defined and container_networks[network_address]['bridge'] is defined) - (dynamic_address_gather_filter is defined) or (default_network_interface_name | length > 0)
- name: Set IP to use for {{ network_address }} - name: Set IP to use for {{ network_address }}
set_fact: "{{ network_address }}={{ hostvars[inventory_hostname] | json_query(query) }}" set_fact: "{{ network_address }}={{ hostvars[inventory_hostname] | json_query(query) }}"