From 152bae8b96c5d78193501b21fee84132dc4d7f12 Mon Sep 17 00:00:00 2001 From: James Denton Date: Wed, 6 Feb 2019 19:39:04 +0000 Subject: [PATCH] Convert provider network network_mappings to unique list When users define multiple provider networks in openstack_user_config using the same label<->interface mapping, as seen when defining both a flat and vlan-type network using the same host_bind_override, the network_mappings list contains both (identical) mappings. This causes the Neutron agent to bail with the following error: linuxbridge_neutron_agent [-] Parsing physical_interface_mappings failed: Key vlan in mapping: 'vlan:ens1f0' not unique. Agent terminated! This patch converts the list->set->list to ensure unique mappings. Change-Id: Ia9093ebf23c4ec0209ada07e76048ecbadb9ee41 --- library/provider_networks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/provider_networks b/library/provider_networks index 326accbd..5c050a70 100644 --- a/library/provider_networks +++ b/library/provider_networks @@ -348,7 +348,7 @@ def main(): 'network_geneve_ranges_list': pnp.network_geneve_ranges, 'network_flat_networks': ','.join(pnp.network_flat_networks), 'network_flat_networks_list': pnp.network_flat_networks, - 'network_mappings': ','.join(pnp.network_mappings), + 'network_mappings': ','.join(list(set(pnp.network_mappings))), 'network_mappings_list': pnp.network_mappings, 'network_types': ','.join(pnp.network_types), 'network_sriov_mappings': ','.join(pnp.network_sriov_mappings),