stackforge/puppet-openstack-cloud
Code Issues Proposed changes

neutron: Allow user to specify tunnel_type (gre, vxlan, etc...)

Browse Source 
This patch allows a deployer to specify which tunnel_type s/he wants
her openstack installation to rely on.
This commit is contained in:
Yanis Guenane
2014-07-30 12:18:46 -04:00
parent 835e962b06
commit f5749312a4
7 changed files with 61 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spec/classes/cloud_network_metadata_spec.rb
View File

@@ -37,6 +37,9 @@ describe 'cloud::network::metadata' do
debug => true,
use_syslog => true,
dhcp_lease_duration => '10',
tunnel_types => ['vxlan'],
tenant_network_types => ['vxlan'],
type_drivers => ['gre', 'vlan', 'flat', 'vxlan'],
log_facility => 'LOG_LOCAL0' }"
end
@@ -74,13 +77,13 @@ describe 'cloud::network::metadata' do
)
should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true,
:tunnel_types => ['gre'],
:tunnel_types => ['vxlan'],
:bridge_mappings => ['public:br-pub'],
:local_ip => '10.0.1.1'
)
should contain_class('neutron::plugins::ml2').with(
:type_drivers => ['gre','vlan','flat'],
:tenant_network_types => ['gre'],
:type_drivers => ['gre', 'vlan', 'flat', 'vxlan'],
:tenant_network_types => ['vxlan'],
:mechanism_drivers => ['openvswitch','l2population'],
:tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'],