From 5abaebb444f5b23403e0d7386f8c318b52c6095a Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Fri, 16 May 2014 10:32:31 -0400
Subject: [PATCH] update firewall_driver for OVS

---
 manifests/network.pp                          | 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 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/network.pp b/manifests/network.pp
index 2b347134..be4dcf95 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -118,7 +118,7 @@ class cloud::network(
     tunnel_id_ranges      => ['1:10000'],
     mechanism_drivers     => ['openvswitch','l2population'],
     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.
diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb
index f65b661c..be4bbeb8 100644
--- a/spec/classes/cloud_network_controller_spec.rb
+++ b/spec/classes/cloud_network_controller_spec.rb
@@ -84,7 +84,7 @@ describe 'cloud::network::controller' do
           :tunnel_id_ranges       => ['1:10000'],
           :network_vlan_ranges    => ['physnet1:1000:2999'],
           :enable_security_group  => true,
-          :firewall_driver        => 'neutron.agent.not.a.real.FirewallDriver'
+          :firewall_driver        => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
       )
     end
 
diff --git a/spec/classes/cloud_network_dhcp_spec.rb b/spec/classes/cloud_network_dhcp_spec.rb
index 7309d774..73b338cd 100644
--- a/spec/classes/cloud_network_dhcp_spec.rb
+++ b/spec/classes/cloud_network_dhcp_spec.rb
@@ -73,7 +73,7 @@ describe 'cloud::network::dhcp' do
           :tunnel_id_ranges       => ['1:10000'],
           :network_vlan_ranges    => ['physnet1:1000:2999'],
           :enable_security_group  => true,
-          :firewall_driver        => 'neutron.agent.not.a.real.FirewallDriver'
+          :firewall_driver        => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
       )
     end
 
diff --git a/spec/classes/cloud_network_l3_spec.rb b/spec/classes/cloud_network_l3_spec.rb
index 0b6f33c6..880c704a 100644
--- a/spec/classes/cloud_network_l3_spec.rb
+++ b/spec/classes/cloud_network_l3_spec.rb
@@ -73,7 +73,7 @@ describe 'cloud::network::l3' do
           :tunnel_id_ranges       => ['1:10000'],
           :network_vlan_ranges    => ['physnet1:1000:2999'],
           :enable_security_group  => true,
-          :firewall_driver        => 'neutron.agent.not.a.real.FirewallDriver'
+          :firewall_driver        => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
       )
     end
 
diff --git a/spec/classes/cloud_network_lbaas_spec.rb b/spec/classes/cloud_network_lbaas_spec.rb
index ea7c0086..ef3779a5 100644
--- a/spec/classes/cloud_network_lbaas_spec.rb
+++ b/spec/classes/cloud_network_lbaas_spec.rb
@@ -73,7 +73,7 @@ describe 'cloud::network::lbaas' do
           :tunnel_id_ranges       => ['1:10000'],
           :network_vlan_ranges    => ['physnet1:1000:2999'],
           :enable_security_group  => true,
-          :firewall_driver        => 'neutron.agent.not.a.real.FirewallDriver'
+          :firewall_driver        => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
       )
     end
 
diff --git a/spec/classes/cloud_network_metadata_spec.rb b/spec/classes/cloud_network_metadata_spec.rb
index 3611e8ae..f5b431e3 100644
--- a/spec/classes/cloud_network_metadata_spec.rb
+++ b/spec/classes/cloud_network_metadata_spec.rb
@@ -80,7 +80,7 @@ describe 'cloud::network::metadata' do
           :tunnel_id_ranges       => ['1:10000'],
           :network_vlan_ranges    => ['physnet1:1000:2999'],
           :enable_security_group  => true,
-          :firewall_driver        => 'neutron.agent.not.a.real.FirewallDriver'
+          :firewall_driver        => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
       )
     end
 
diff --git a/spec/classes/cloud_network_vpn_spec.rb b/spec/classes/cloud_network_vpn_spec.rb
index 3b2b4a55..43e5b702 100644
--- a/spec/classes/cloud_network_vpn_spec.rb
+++ b/spec/classes/cloud_network_vpn_spec.rb
@@ -68,7 +68,7 @@ describe 'cloud::network::vpn' do
           :tunnel_id_ranges       => ['1:10000'],
           :network_vlan_ranges    => ['physnet1:1000:2999'],
           :enable_security_group  => true,
-          :firewall_driver        => 'neutron.agent.not.a.real.FirewallDriver'
+          :firewall_driver        => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
       )
     end