stackforge/puppet-openstack-cloud
Code Issues Proposed changes

network: ensure security group api works

Browse Source 
close bug #12

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-01-23 18:49:27 +01:00
parent 07345ba9cc
commit e3f5fed618
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/network.pp
View File

@ -73,7 +73,7 @@ class cloud::network(
tenant_network_types => ['gre'],
mechanism_drivers => ['openvswitch'],
tunnel_id_ranges => ['1:10000'],
enable_security_group => true
enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
}
}

10
spec/classes/cloud_network_compute_spec.rb
View File

@ -58,12 +58,12 @@ describe 'cloud::network::compute' do
:local_ip => '10.0.1.1'
)
should contain_class('neutron::plugins::ml2').with(
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000']
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000'],
:enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
)
should contain_neutron_plugin_ml2('securitygroup/firewall_driver').with_value(true)
end
it 'configure neutron on compute node' do

10
spec/classes/cloud_network_controller_spec.rb
View File

@ -62,12 +62,12 @@ describe 'cloud::network::controller' do
:local_ip => '10.0.1.1'
)
should contain_class('neutron::plugins::ml2').with(
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000']
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000'],
:enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
)
should contain_neutron_plugin_ml2('securitygroup/firewall_driver').with_value(true)
end
it 'configure neutron server' do

10
spec/classes/cloud_network_dhcp_spec.rb
View File

@ -56,12 +56,12 @@ describe 'cloud::network::dhcp' do
:local_ip => '10.0.1.1'
)
should contain_class('neutron::plugins::ml2').with(
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000']
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000'],
:enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
)
should contain_neutron_plugin_ml2('securitygroup/firewall_driver').with_value(true)
end
it 'configure neutron dhcp' do

10
spec/classes/cloud_network_l3_spec.rb
View File

@ -57,12 +57,12 @@ describe 'cloud::network::l3' do
:local_ip => '10.0.1.1'
)
should contain_class('neutron::plugins::ml2').with(
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000']
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000'],
:enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
)
should contain_neutron_plugin_ml2('securitygroup/firewall_driver').with_value(true)
end
it 'configure neutron l3' do

10
spec/classes/cloud_network_lbaas_spec.rb
View File

@ -56,12 +56,12 @@ describe 'cloud::network::lbaas' do
:local_ip => '10.0.1.1'
)
should contain_class('neutron::plugins::ml2').with(
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000']
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000'],
:enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
)
should contain_neutron_plugin_ml2('securitygroup/firewall_driver').with_value(true)
end
it 'configure neutron lbaas' do

10
spec/classes/cloud_network_metadata_spec.rb
View File

@ -63,12 +63,12 @@ describe 'cloud::network::metadata' do
:local_ip => '10.0.1.1'
)
should contain_class('neutron::plugins::ml2').with(
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000']
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000'],
:enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
)
should contain_neutron_plugin_ml2('securitygroup/firewall_driver').with_value(true)
end
it 'configure neutron metadata' do

10
spec/classes/cloud_network_vpn_spec.rb
View File

@ -52,12 +52,12 @@ describe 'cloud::network::vpn' do
:local_ip => '10.0.1.1'
)
should contain_class('neutron::plugins::ml2').with(
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000']
:type_drivers => ['gre'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch'],
:tunnel_id_ranges => ['1:10000'],
:enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
)
should contain_neutron_plugin_ml2('securitygroup/firewall_driver').with_value(true)
end
it 'configure neutron vpnaas' do