From 89bd217c11fd5048bc5d520751956be13923ac94 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Thu, 15 May 2014 19:16:17 -0400
Subject: [PATCH] Update firewall_driver for Icehouse

While default value is merged:
https://review.openstack.org/93825

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 manifests/network.pp                          | 3 ++-
 spec/classes/cloud_network_controller_spec.rb | 3 ++-
 spec/classes/cloud_network_dhcp_spec.rb       | 3 ++-
 spec/classes/cloud_network_l3_spec.rb         | 3 ++-
 spec/classes/cloud_network_lbaas_spec.rb      | 3 ++-
 spec/classes/cloud_network_metadata_spec.rb   | 3 ++-
 spec/classes/cloud_network_vpn_spec.rb        | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/manifests/network.pp b/manifests/network.pp
index 8d38b6be..2b347134 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -117,7 +117,8 @@ class cloud::network(
     network_vlan_ranges   => $provider_vlan_ranges,
     tunnel_id_ranges      => ['1:10000'],
     mechanism_drivers     => ['openvswitch','l2population'],
-    enable_security_group => true
+    enable_security_group => true,
+    firewall_driver       => 'neutron.agent.not.a.real.FirewallDriver'
   }
 
   # 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 7e1b6099..f65b661c 100644
--- a/spec/classes/cloud_network_controller_spec.rb
+++ b/spec/classes/cloud_network_controller_spec.rb
@@ -83,7 +83,8 @@ describe 'cloud::network::controller' do
           :mechanism_drivers      => ['openvswitch','l2population'],
           :tunnel_id_ranges       => ['1:10000'],
           :network_vlan_ranges    => ['physnet1:1000:2999'],
-          :enable_security_group  => true
+          :enable_security_group  => true,
+          :firewall_driver        => 'neutron.agent.not.a.real.FirewallDriver'
       )
     end
 
diff --git a/spec/classes/cloud_network_dhcp_spec.rb b/spec/classes/cloud_network_dhcp_spec.rb
index f0a4611a..7309d774 100644
--- a/spec/classes/cloud_network_dhcp_spec.rb
+++ b/spec/classes/cloud_network_dhcp_spec.rb
@@ -72,7 +72,8 @@ describe 'cloud::network::dhcp' do
           :mechanism_drivers      => ['openvswitch','l2population'],
           :tunnel_id_ranges       => ['1:10000'],
           :network_vlan_ranges    => ['physnet1:1000:2999'],
-          :enable_security_group  => true
+          :enable_security_group  => true,
+          :firewall_driver        => 'neutron.agent.not.a.real.FirewallDriver'
       )
     end
 
diff --git a/spec/classes/cloud_network_l3_spec.rb b/spec/classes/cloud_network_l3_spec.rb
index 577f1c74..0b6f33c6 100644
--- a/spec/classes/cloud_network_l3_spec.rb
+++ b/spec/classes/cloud_network_l3_spec.rb
@@ -72,7 +72,8 @@ describe 'cloud::network::l3' do
           :mechanism_drivers      => ['openvswitch','l2population'],
           :tunnel_id_ranges       => ['1:10000'],
           :network_vlan_ranges    => ['physnet1:1000:2999'],
-          :enable_security_group  => true
+          :enable_security_group  => true,
+          :firewall_driver        => 'neutron.agent.not.a.real.FirewallDriver'
       )
     end
 
diff --git a/spec/classes/cloud_network_lbaas_spec.rb b/spec/classes/cloud_network_lbaas_spec.rb
index e780cedb..ea7c0086 100644
--- a/spec/classes/cloud_network_lbaas_spec.rb
+++ b/spec/classes/cloud_network_lbaas_spec.rb
@@ -72,7 +72,8 @@ describe 'cloud::network::lbaas' do
           :mechanism_drivers      => ['openvswitch','l2population'],
           :tunnel_id_ranges       => ['1:10000'],
           :network_vlan_ranges    => ['physnet1:1000:2999'],
-          :enable_security_group  => true
+          :enable_security_group  => true,
+          :firewall_driver        => 'neutron.agent.not.a.real.FirewallDriver'
       )
     end
 
diff --git a/spec/classes/cloud_network_metadata_spec.rb b/spec/classes/cloud_network_metadata_spec.rb
index abee3f64..3611e8ae 100644
--- a/spec/classes/cloud_network_metadata_spec.rb
+++ b/spec/classes/cloud_network_metadata_spec.rb
@@ -79,7 +79,8 @@ describe 'cloud::network::metadata' do
           :mechanism_drivers      => ['openvswitch','l2population'],
           :tunnel_id_ranges       => ['1:10000'],
           :network_vlan_ranges    => ['physnet1:1000:2999'],
-          :enable_security_group  => true
+          :enable_security_group  => true,
+          :firewall_driver        => 'neutron.agent.not.a.real.FirewallDriver'
       )
     end
 
diff --git a/spec/classes/cloud_network_vpn_spec.rb b/spec/classes/cloud_network_vpn_spec.rb
index b2abe3b6..3b2b4a55 100644
--- a/spec/classes/cloud_network_vpn_spec.rb
+++ b/spec/classes/cloud_network_vpn_spec.rb
@@ -67,7 +67,8 @@ describe 'cloud::network::vpn' do
           :mechanism_drivers      => ['openvswitch','l2population'],
           :tunnel_id_ranges       => ['1:10000'],
           :network_vlan_ranges    => ['physnet1:1000:2999'],
-          :enable_security_group  => true
+          :enable_security_group  => true,
+          :firewall_driver        => 'neutron.agent.not.a.real.FirewallDriver'
       )
     end