openstack/puppet-neutron
Code Issues Proposed changes

Add fwaas package for Kilo in Red Hat platforms

Browse Source 
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
This commit is contained in:
Javier Pena 2015-03-04 19:14:31 +01:00
parent 8946a0e99b
commit 36c50bf76b
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

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

4
manifests/services/fwaas.pp
View File

@ -59,9 +59,9 @@ class neutron::services::fwaas (
} }
} elsif($::osfamily == 'Redhat') { } elsif($::osfamily == 'Redhat') {
# RH platforms # RH platforms
ensure_resource( 'package', $::neutron::params::package_name, ensure_resource( 'package', $::neutron::params::fwaas_package,
{ 'ensure' => $neutron::package_ensure }) { '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_fwaas_service_config {

5
spec/classes/neutron_services_fwaas_spec.rb
View File

@ -90,11 +90,14 @@ describe 'neutron::services::fwaas' do
end end
let :platform_params do let :platform_params do
{ :package_name => 'openstack-neutron' } { :fwaas_package => 'openstack-neutron-fwaas' }
end end
it_configures 'neutron fwaas service plugin' 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
end end