Merge "Fix neutron plugin get network_type" into stable/yoga
This commit is contained in:
commit
9bac340b5b
@ -398,13 +398,13 @@ class NeutronNetworkPlugin(network.NetworkBaseAPI):
|
|||||||
"(found: %s)." % (phy, phy_nets))
|
"(found: %s)." % (phy, phy_nets))
|
||||||
raise exception.NetworkBadConfigurationException(reason=msg)
|
raise exception.NetworkBadConfigurationException(reason=msg)
|
||||||
else:
|
else:
|
||||||
network_type = net_info['provider:network_type']
|
network_type = net_info.get('provider:network_type')
|
||||||
segmentation_id = net_info['provider:segmentation_id']
|
segmentation_id = net_info.get('provider:segmentation_id')
|
||||||
|
|
||||||
provider_nw_dict = {
|
provider_nw_dict = {
|
||||||
'network_type': network_type,
|
'network_type': network_type,
|
||||||
'segmentation_id': segmentation_id,
|
'segmentation_id': segmentation_id,
|
||||||
'mtu': net_info['mtu'],
|
'mtu': net_info.get('mtu'),
|
||||||
}
|
}
|
||||||
share_network_subnet.update(provider_nw_dict)
|
share_network_subnet.update(provider_nw_dict)
|
||||||
|
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Some neutron integrations might not have the network type, so the neutron network
|
||||||
|
plugin is fixed by taking that scenario in consideration.
|
||||||
|
`Launchpad bug #1987315 <https://bugs.launchpad.ne/manila/+bug/1987315>`_
|
||||||
|
for more details.
|
Loading…
Reference in New Issue
Block a user