Merge "fwaas config needs to notify l3 agent service"

manifests/services/fwaas.pp

@@ -45,6 +45,9 @@ class neutron::services::fwaas (
 
   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 {

spec/classes/neutron_services_fwaas_spec.rb

@@ -22,7 +22,8 @@ require 'spec_helper'
 
 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