From f47731d3bdc7c5f81509fa167e84a857ce59517e Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 6 May 2014 07:09:52 +0200 Subject: [PATCH] neutron: use new model for enabling security group API --- manifests/network.pp | 2 +- spec/classes/cloud_compute_hypervisor_spec.rb | 2 +- spec/classes/cloud_network_controller_spec.rb | 2 +- spec/classes/cloud_network_dhcp_spec.rb | 2 +- spec/classes/cloud_network_l3_spec.rb | 2 +- spec/classes/cloud_network_lbaas_spec.rb | 2 +- spec/classes/cloud_network_metadata_spec.rb | 2 +- spec/classes/cloud_network_vpn_spec.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifests/network.pp b/manifests/network.pp index 9a3b83be..8d38b6be 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -117,7 +117,7 @@ class cloud::network( network_vlan_ranges => $provider_vlan_ranges, tunnel_id_ranges => ['1:10000'], mechanism_drivers => ['openvswitch','l2population'], - enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' + enable_security_group => true } # TODO(EmilienM) Temporary, need to be fixed upstream. diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index 8f99c130..81ebc5b3 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -153,7 +153,7 @@ describe 'cloud::compute::hypervisor' do :mechanism_drivers => ['openvswitch','l2population'], :tunnel_id_ranges => ['1:10000'], :network_vlan_ranges => ['physnet1:1000:2999'], - :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' + :enable_security_group => true ) end diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index ee232e4d..f0d40a45 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -83,7 +83,7 @@ describe 'cloud::network::controller' do :mechanism_drivers => ['openvswitch','l2population'], :tunnel_id_ranges => ['1:10000'], :network_vlan_ranges => ['physnet1:1000:2999'], - :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' + :enable_security_group => true ) end diff --git a/spec/classes/cloud_network_dhcp_spec.rb b/spec/classes/cloud_network_dhcp_spec.rb index cfb8c5d6..026d8e34 100644 --- a/spec/classes/cloud_network_dhcp_spec.rb +++ b/spec/classes/cloud_network_dhcp_spec.rb @@ -72,7 +72,7 @@ describe 'cloud::network::dhcp' do :mechanism_drivers => ['openvswitch','l2population'], :tunnel_id_ranges => ['1:10000'], :network_vlan_ranges => ['physnet1:1000:2999'], - :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' + :enable_security_group => true ) end diff --git a/spec/classes/cloud_network_l3_spec.rb b/spec/classes/cloud_network_l3_spec.rb index 998d89e6..577f1c74 100644 --- a/spec/classes/cloud_network_l3_spec.rb +++ b/spec/classes/cloud_network_l3_spec.rb @@ -72,7 +72,7 @@ describe 'cloud::network::l3' do :mechanism_drivers => ['openvswitch','l2population'], :tunnel_id_ranges => ['1:10000'], :network_vlan_ranges => ['physnet1:1000:2999'], - :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' + :enable_security_group => true ) end diff --git a/spec/classes/cloud_network_lbaas_spec.rb b/spec/classes/cloud_network_lbaas_spec.rb index 143e0047..e780cedb 100644 --- a/spec/classes/cloud_network_lbaas_spec.rb +++ b/spec/classes/cloud_network_lbaas_spec.rb @@ -72,7 +72,7 @@ describe 'cloud::network::lbaas' do :mechanism_drivers => ['openvswitch','l2population'], :tunnel_id_ranges => ['1:10000'], :network_vlan_ranges => ['physnet1:1000:2999'], - :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' + :enable_security_group => true ) end diff --git a/spec/classes/cloud_network_metadata_spec.rb b/spec/classes/cloud_network_metadata_spec.rb index 5114597c..abee3f64 100644 --- a/spec/classes/cloud_network_metadata_spec.rb +++ b/spec/classes/cloud_network_metadata_spec.rb @@ -79,7 +79,7 @@ describe 'cloud::network::metadata' do :mechanism_drivers => ['openvswitch','l2population'], :tunnel_id_ranges => ['1:10000'], :network_vlan_ranges => ['physnet1:1000:2999'], - :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' + :enable_security_group => true ) end diff --git a/spec/classes/cloud_network_vpn_spec.rb b/spec/classes/cloud_network_vpn_spec.rb index ca033a72..b2abe3b6 100644 --- a/spec/classes/cloud_network_vpn_spec.rb +++ b/spec/classes/cloud_network_vpn_spec.rb @@ -67,7 +67,7 @@ describe 'cloud::network::vpn' do :mechanism_drivers => ['openvswitch','l2population'], :tunnel_id_ranges => ['1:10000'], :network_vlan_ranges => ['physnet1:1000:2999'], - :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' + :enable_security_group => true ) end