Add fwaas package for Kilo in Red Hat platforms

Starting in Kilo, Red Hat platforms are packaging FWaaS as a
separate package, rather than inside openstack-neutron. If this
package is not merged, neutron-server will fail to start when fwaas
is configured.

Change-Id: I6bf84aa803ab8b2bc4822352f6df72cf03ebe3dc

Author: javierpena

neutron/manifests/params.pp

@@ -57,6 +57,8 @@
     $l3_agent_package   = false
     $l3_agent_service   = 'neutron-l3-agent'
 
+    $fwaas_package      = 'openstack-neutron-fwaas'
+
     $metadata_agent_service = 'neutron-metadata-agent'
 
     $cliff_package      = 'python-cliff'
@@ -126,6 +128,8 @@
     $l3_agent_package   = 'neutron-l3-agent'
     $l3_agent_service   = 'neutron-l3-agent'
 
+    $fwaas_package      = false
+
     $cliff_package      = 'python-cliff'
     $kernel_headers     = "linux-headers-${::kernelrelease}"
 

neutron/manifests/services/fwaas.pp

@@ -59,9 +59,9 @@
     }
   } elsif($::osfamily == 'Redhat') {
     # RH platforms
-    ensure_resource( 'package', $::neutron::params::package_name,
+    ensure_resource( 'package', $::neutron::params::fwaas_package,
       { 'ensure' => $neutron::package_ensure })
-    Package[$::neutron::params::package_name] -> Neutron_fwaas_service_config<||>
+    Package[$::neutron::params::fwaas_package] -> Neutron_fwaas_service_config<||>
   }
 
   neutron_fwaas_service_config {

neutron/spec/classes/neutron_services_fwaas_spec.rb

@@ -90,11 +90,14 @@
     end
 
     let :platform_params do
-      { :package_name => 'openstack-neutron' }
+      { :fwaas_package => 'openstack-neutron-fwaas' }
     end
 
     it_configures 'neutron fwaas service plugin'
 
+    it 'installs neutron fwaas service package' do
+      should contain_package('openstack-neutron-fwaas').with_ensure('present')
+    end
   end
 
 end