Merge "Install lbaas driver with lbaas service class."

This commit is contained in:
Jenkins
2016-05-24 20:15:49 +00:00
committed by Gerrit Code Review
3 changed files with 23 additions and 2 deletions

View File

@@ -22,6 +22,10 @@
#
# === Parameters:
#
# [*ensure_lbaas_driver_package*]
# (optional) Whether to install the lbaas driver package
# Defaults to 'present'
#
# [*service_providers*]
# (optional) Array of allowed service types or '<SERVICE DEFAULT>'.
# Note: The default upstream value is empty.
@@ -39,12 +43,20 @@
# Defaults to false
#
class neutron::services::lbaas (
$package_ensure = false,
$service_providers = $::os_service_default,
$ensure_lbaas_driver_package = 'present',
$service_providers = $::os_service_default,
# DEPRECATED
$package_ensure = false,
) {
include ::neutron::params
if $ensure_lbaas_driver_package {
ensure_packages(['python-neutron-lbaas'], {
ensure => $ensure_lbaas_driver_package,
tag => ['openstack', 'neutron-package']
})
}
if $package_ensure {
warning('Package ensure is deprecated. The neutron::agents::lbaas class should be used to install the agent')
# agent package contains both agent and service resources

View File

@@ -0,0 +1,5 @@
---
fixes:
- Added python-neutron-lbaas package to be installed with neutron::services::lbaas.
this removes a dependency of installing agent on neutron api server to enable
the lbaas service.

View File

@@ -32,6 +32,10 @@ describe 'neutron::services::lbaas' do
let :params do
default_params
end
it 'should contain python-neutron-lbaas package' do
is_expected.to contain_package('python-neutron-lbaas').with({ :ensure => 'present' })
end
end
context 'with multiple service providers' do