openstack/puppet-neutron
Code Issues Proposed changes

FWaaS: update packaging for Debian & Ubuntu

Browse Source 
Ubuntu [1] and Debian [2] are now using neutron-fwaas.
Also cleaning unit-tests.

[1] http://packages.ubuntu.com/source/vivid/neutron-fwaas
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=783590

Closes-bug #1450589

Change-Id: Ia9c951941c2832b0c6e6b987ed64924b9c827195
This commit is contained in:
Emilien Macchi 2015-04-30 15:17:01 -04:00
parent a553fe4213
commit be67982d55
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@ -142,7 +142,7 @@ class neutron::params {
$l3_agent_package = 'neutron-l3-agent'
$l3_agent_service = 'neutron-l3-agent'
$fwaas_package = false
$fwaas_package = 'neutron-fwaas'
$cliff_package = 'python-cliff'
$kernel_headers = "linux-headers-${::kernelrelease}"

4
manifests/services/fwaas.pp
View File

@ -55,11 +55,11 @@ class neutron::services::fwaas (
Package[$::neutron::params::vpnaas_agent_package] -> Neutron_fwaas_service_config<||>
}
else {
ensure_resource( 'package', $::neutron::params::l3_agent_package, {
ensure_resource( 'package', $::neutron::params::fwaas_package, {
'ensure' => $neutron::package_ensure,
'tag' => 'openstack'
})
Package[$::neutron::params::l3_agent_package] -> Neutron_fwaas_service_config<||>
Package[$::neutron::params::fwaas_package] -> Neutron_fwaas_service_config<||>
}
} elsif($::osfamily == 'Redhat') {
# RH platforms

39
spec/classes/neutron_services_fwaas_spec.rb
View File

@ -46,20 +46,32 @@ describe 'neutron::services::fwaas' do
end
end
context 'on Debian platforms' do
context 'on Ubuntu platforms' do
let :facts do
{ :osfamily => 'Debian' }
end
let :platform_params do
{ :l3_agent_package => 'neutron-l3-agent',
:vpnaas_agent_package => 'neutron-vpn-agent'}
{ :osfamily => 'Debian',
:operatingsystem => 'Ubuntu' }
end
it_configures 'neutron fwaas service plugin'
it 'installs neutron l3 agent package' do
is_expected.to contain_package('neutron-l3-agent').with(
it 'installs neutron fwaas package' do
is_expected.to contain_package('neutron-fwaas').with(
:ensure => 'present',
:tag => 'openstack'
)
end
end
context 'on Debian platforms without VPNaaS' do
let :facts do
{ :osfamily => 'Debian',
:operatingsystem => 'Debian' }
end
it_configures 'neutron fwaas service plugin'
it 'installs neutron fwaas package' do
is_expected.to contain_package('neutron-fwaas').with(
:ensure => 'present',
:tag => 'openstack'
)
@ -71,11 +83,6 @@ describe 'neutron::services::fwaas' do
{ :osfamily => 'Debian' }
end
let :platform_params do
{ :l3_agent_package => 'neutron-l3-agent',
:vpnaas_agent_package => 'neutron-vpn-agent' }
end
let :params do
{ :vpnaas_agent_package => true }
end
@ -95,10 +102,6 @@ describe 'neutron::services::fwaas' do
{ :osfamily => 'RedHat' }
end
let :platform_params do
{ :fwaas_package => 'openstack-neutron-fwaas' }
end
it_configures 'neutron fwaas service plugin'
it 'installs neutron fwaas service package' do