diff --git a/manifests/params.pp b/manifests/params.pp index f7059cacd..4b5346506 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -57,6 +57,8 @@ class neutron::params { $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 @@ class neutron::params { $l3_agent_package = 'neutron-l3-agent' $l3_agent_service = 'neutron-l3-agent' + $fwaas_package = false + $cliff_package = 'python-cliff' $kernel_headers = "linux-headers-${::kernelrelease}" diff --git a/manifests/services/fwaas.pp b/manifests/services/fwaas.pp index fbe3d71ee..f24e037a2 100644 --- a/manifests/services/fwaas.pp +++ b/manifests/services/fwaas.pp @@ -59,9 +59,9 @@ class neutron::services::fwaas ( } } 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 { diff --git a/spec/classes/neutron_services_fwaas_spec.rb b/spec/classes/neutron_services_fwaas_spec.rb index 03841913d..5a5e32a20 100644 --- a/spec/classes/neutron_services_fwaas_spec.rb +++ b/spec/classes/neutron_services_fwaas_spec.rb @@ -90,11 +90,14 @@ describe 'neutron::services::fwaas' do 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