fwaas config needs to notify l3 agent service

This patch: * make sure each modification to fwaas configuration will notify l3 agent service. * will write the configuration *before* trying to start l3 agent service. Without doing that, l3 agent would start without fwaas enabled. Change-Id: Ib5c0d01726a2b56c4f0be9879add7b3c9d6038cc
openstack · Dec 8, 2015 · 0e041d4 · 0e041d4
1 parent eaf2f39
commit 0e041d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/manifests/services/fwaas.pp b/manifests/services/fwaas.pp
@@ -45,6 +45,9 @@
 
   include ::neutron::params
 
+  # FWaaS needs to be enabled before starting Neutron L3 agent
+  Neutron_fwaas_service_config<||> ~> Service['neutron-l3']
+
   if ($::osfamily == 'Debian') {
     # Debian platforms
     if $vpnaas_agent_package {

diff --git a/spec/classes/neutron_services_fwaas_spec.rb b/spec/classes/neutron_services_fwaas_spec.rb
@@ -22,7 +22,8 @@
 
 describe 'neutron::services::fwaas' do
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }"
+    "class { 'neutron': rabbit_password => 'passw0rd' }
+     include ::neutron::agents::l3"
   end
 
   let :test_facts do