stackforge/puppet-openstack-cloud
Code Issues Proposed changes

network: enable more features

Browse Source 
* L2 population
* Provider networks capabilities (VLAN)

Close bug #167

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-02-05 17:32:04 +01:00
parent aa2b61394e
commit b5ae7d21a6
8 changed files with 115 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spec/classes/cloud_network_metadata_spec.rb
View File

@@ -24,12 +24,14 @@ describe 'cloud::network::metadata' do
let :pre_condition do
"class { 'cloud::network':
rabbit_hosts => ['10.0.0.1'],
rabbit_password => 'secrete',
tunnel_eth => '10.0.1.1',
api_eth => '10.0.0.1',
verbose => true,
debug => true }"
rabbit_hosts => ['10.0.0.1'],
rabbit_password => 'secrete',
tunnel_eth => '10.0.1.1',
api_eth => '10.0.0.1',
provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true,
debug => true }"
end
let :params do
@@ -60,13 +62,16 @@ describe 'cloud::network::metadata' do
)
should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true,
:tunnel_types => ['gre'],
:bridge_mappings => ['physnet1:br-eth1'],
:local_ip => '10.0.1.1'
)
should contain_class('neutron::plugins::ml2').with(
:type_drivers => ['gre'],
:type_drivers => ['gre','vlan'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:mechanism_drivers => ['openvswitch','l2population'],
:tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'],
:enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
)
end