openstack
/
puppet-congress
Code Issues Proposed changes

Replace deprecated drivers parameter by disabled_drivers 

The [DEFAULT]drivers parameter was already deprecated in favor of the
new parameter, [DEFAULT]disabled_drivers [1].
This patch replaces the parameter in puppet-congress accordingly.

[1] 82a708abcf72892c0864c9beef1c412cf3b23194

Change-Id: I77bb6e64b6bae7811be73d4a1615764095dcf0cd
This commit is contained in:
Takashi Kajinami 2020-05-04 20:39:45 +09:00
parent c60261e068
commit 11875c34a9
3 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/init.pp
View File

@ -170,9 +170,9 @@
# (Optional) Password for message broker authentication
# Defaults to $::os_service_default
#
# [*drivers*]
# (optional) Comma delimited list of drivers for congress.
# Defaults to '$::congress::params::drivers'
# [*disabled_drivers*]
# (optional) Comma delimited list of disabled_drivers for congress.
# Defaults to $::os_service_default
#
# [*sync_db*]
# (Optional) Run db sync on the node.
@ -186,6 +186,12 @@
# (Optional) Ensure state for package.
# Defaults to present.
#
# DEPRECATED PARAMETERS
#
# [*drivers*]
# (optional) Comma delimited list of drivers for congress.
# Defaults to undef
#
# == Authors
#
# Dan Radez <dradez@redhat.com>
@ -230,10 +236,12 @@ class congress(
$amqp_sasl_config_name = $::os_service_default,
$amqp_username = $::os_service_default,
$amqp_password = $::os_service_default,
$drivers = $::congress::params::drivers,
$disabled_drivers = $::os_service_default,
$sync_db = true,
$package_name = $::congress::params::package_name,
$package_ensure = 'present',
# DEPRECATED PARAMETERS
$drivers = undef
) inherits congress::params {
include congress::deps
@ -244,8 +252,16 @@ class congress(
tag => ['openstack', 'congress-package'],
}
if $drivers != undef {
warning('The congress::drivers parameter is deprecated and will be removed \
in a future release. Use congress::disabled_drivers instead.')
congress_config {
'DEFAULT/drivers' : value => join(any2array($drivers), ',');
}
}
congress_config {
'DEFAULT/drivers' : value => join(any2array($drivers), ',');
'DEFAULT/disabled_drivers' : value => join(any2array($disabled_drivers), ',');
}
if $sync_db {

4
manifests/params.pp
View File

@ -6,10 +6,6 @@ class congress::params {
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$drivers = ['congress.datasources.neutronv2_driver.NeutronV2Driver,congress.datasources.glancev2_driver.GlanceV2Driver',
'congress.datasources.nova_driver.NovaDriver',
'congress.datasources.keystone_driver.KeystoneDriver',
'congress.datasources.cinder_driver.CinderDriver']
$client_package_name = "python${pyvers}-congressclient"
$group = 'congress'

9
releasenotes/notes/disabled_drivers-c15358e53443e819.yaml Normal file
View File

@ -0,0 +1,9 @@
---
features:
- |
The ``congress::disabled_drivers`` parameter is added to configure a list
of disabled drivers.
deprecations:
- |
The ``congress::drivers`` parameter has been deprecated and will be removed
in a future release. Use ``congress::disabled_drivers`` instead.