stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #468 from enovance/icehouse-sg-api

Browse Source 
update firewall_driver for OVS
This commit is contained in:
Yanis Guenane
2014-05-16 10:58:28 -04:00
parent 39076ed032 5abaebb444
commit 514d90a1f3
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/network.pp
View File

@@ -118,7 +118,7 @@ class cloud::network(
tunnel_id_ranges => ['1:10000'], tunnel_id_ranges => ['1:10000'],
mechanism_drivers => ['openvswitch','l2population'], mechanism_drivers => ['openvswitch','l2population'],
enable_security_group => true, enable_security_group => true,
firewall_driver => 'neutron.agent.not.a.real.FirewallDriver' firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
} }
# TODO(EmilienM) Temporary, need to be fixed upstream. # TODO(EmilienM) Temporary, need to be fixed upstream.

2
spec/classes/cloud_network_controller_spec.rb
View File

@@ -84,7 +84,7 @@ describe 'cloud::network::controller' do
:tunnel_id_ranges => ['1:10000'], :tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'], :network_vlan_ranges => ['physnet1:1000:2999'],
:enable_security_group => true, :enable_security_group => true,
:firewall_driver => 'neutron.agent.not.a.real.FirewallDriver' :firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
) )
end end

2
spec/classes/cloud_network_dhcp_spec.rb
View File

@@ -73,7 +73,7 @@ describe 'cloud::network::dhcp' do
:tunnel_id_ranges => ['1:10000'], :tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'], :network_vlan_ranges => ['physnet1:1000:2999'],
:enable_security_group => true, :enable_security_group => true,
:firewall_driver => 'neutron.agent.not.a.real.FirewallDriver' :firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
) )
end end

2
spec/classes/cloud_network_l3_spec.rb
View File

@@ -73,7 +73,7 @@ describe 'cloud::network::l3' do
:tunnel_id_ranges => ['1:10000'], :tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'], :network_vlan_ranges => ['physnet1:1000:2999'],
:enable_security_group => true, :enable_security_group => true,
:firewall_driver => 'neutron.agent.not.a.real.FirewallDriver' :firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
) )
end end

2
spec/classes/cloud_network_lbaas_spec.rb
View File

@@ -73,7 +73,7 @@ describe 'cloud::network::lbaas' do
:tunnel_id_ranges => ['1:10000'], :tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'], :network_vlan_ranges => ['physnet1:1000:2999'],
:enable_security_group => true, :enable_security_group => true,
:firewall_driver => 'neutron.agent.not.a.real.FirewallDriver' :firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
) )
end end

2
spec/classes/cloud_network_metadata_spec.rb
View File

@@ -80,7 +80,7 @@ describe 'cloud::network::metadata' do
:tunnel_id_ranges => ['1:10000'], :tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'], :network_vlan_ranges => ['physnet1:1000:2999'],
:enable_security_group => true, :enable_security_group => true,
:firewall_driver => 'neutron.agent.not.a.real.FirewallDriver' :firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
) )
end end

2
spec/classes/cloud_network_vpn_spec.rb
View File

@@ -68,7 +68,7 @@ describe 'cloud::network::vpn' do
:tunnel_id_ranges => ['1:10000'], :tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'], :network_vlan_ranges => ['physnet1:1000:2999'],
:enable_security_group => true, :enable_security_group => true,
:firewall_driver => 'neutron.agent.not.a.real.FirewallDriver' :firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
) )
end end