Browse Source

Merge "Ignore OVN Bridge MAC net for inventory generation" into stable/wallaby

changes/47/794947/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
1e5791589a
2 changed files with 8 additions and 0 deletions
  1. +4
    -0
      tripleo_common/constants.py
  2. +4
    -0
      tripleo_common/inventory.py

+ 4
- 0
tripleo_common/constants.py View File

@ -229,3 +229,7 @@ PER_STEP_TASKS = {
}
INVENTORY_NETWORK_CONFIG_FILE = 'inventory-network-config.yaml'
# Hard coded name in:
# tripleo_ansible/ansible_plugins/modules/tripleo_ovn_mac_addresses.py
OVN_MAC_ADDR_NET_NAME = 'ovn_mac_addr_net'

+ 4
- 0
tripleo_common/inventory.py View File

@ -207,6 +207,10 @@ class NeutronData(object):
mandatory_tags = {'tripleo_network_name'}
networks_by_id = {}
for net in self.networks:
# Don't include the OVN Bridge MAC address net
if net.name == constants.OVN_MAC_ADDR_NET_NAME:
continue
tags = self._tags_to_dict(net.tags)
# In case of missing required tags, raise an error.
# neutron is useless as a inventory source in this case.


Loading…
Cancel
Save