openstack/puppet-neutron
Code Issues Proposed changes

Fixes missing 'geneve' network type

Browse Source 
The network type drivers were missing 'geneve', which will allow nodes to
attach nova instances to geneve networks.  This should be allowed by
default[1].

[1]https://github.com/openstack/puppet-neutron/blob/master/manifests/plugins/ml2/type_driver.pp#L121

Change-Id: I1a1bfaa2619edde8a463cd3a6bc6412738d7f596
Closes-Bug: #1762667
This commit is contained in:
ZhongShengping 2018-04-10 14:48:32 +08:00
parent 9a5fa20b2d
commit dd7fd5586c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/plugins/ml2.pp
View File

@ -26,7 +26,7 @@
# (optional) List of network type driver entrypoints to be loaded # (optional) List of network type driver entrypoints to be loaded
# from the neutron.ml2.type_drivers namespace. # from the neutron.ml2.type_drivers namespace.
# Could be an array that can have these elements: # Could be an array that can have these elements:
# local, flat, vlan, gre, vxlan # local, flat, vlan, gre, vxlan, geneve
# Defaults to ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve']. # Defaults to ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'].
# #
# [*extension_drivers*] # [*extension_drivers*]
@ -135,7 +135,7 @@
# Defaults to undef # Defaults to undef
# #
class neutron::plugins::ml2 ( class neutron::plugins::ml2 (
$type_drivers = ['local', 'flat', 'vlan', 'gre', 'vxlan'], $type_drivers = ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'],
$extension_drivers = $::os_service_default, $extension_drivers = $::os_service_default,
$tenant_network_types = ['local', 'flat', 'vlan', 'gre', 'vxlan'], $tenant_network_types = ['local', 'flat', 'vlan', 'gre', 'vxlan'],
$mechanism_drivers = ['openvswitch', 'linuxbridge'], $mechanism_drivers = ['openvswitch', 'linuxbridge'],

2
manifests/plugins/ml2/type_driver.pp
View File

@ -125,7 +125,7 @@ define neutron::plugins::ml2::type_driver (
} }
neutron_plugin_ml2 { neutron_plugin_ml2 {
'ml2_type_geneve/max_header_size': value => $max_header_size; 'ml2_type_geneve/max_header_size': value => $max_header_size;
'ml2_type_geneve/vni_ranges': value => join($vni_ranges,','); 'ml2_type_geneve/vni_ranges': value => join(any2array($vni_ranges),',');
} }
} }
else { else {

2
spec/classes/neutron_plugins_ml2_spec.rb
View File

@ -29,7 +29,7 @@ describe 'neutron::plugins::ml2' do
end end
let :default_params do let :default_params do
{ :type_drivers => ['local', 'flat', 'vlan', 'gre', 'vxlan'], { :type_drivers => ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'],
:tenant_network_types => ['local', 'flat', 'vlan', 'gre', 'vxlan'], :tenant_network_types => ['local', 'flat', 'vlan', 'gre', 'vxlan'],
:mechanism_drivers => ['openvswitch', 'linuxbridge'], :mechanism_drivers => ['openvswitch', 'linuxbridge'],
:flat_networks => '*', :flat_networks => '*',