openstack
/
puppet-designate
Code Issues Proposed changes

Stop inheriting the base designate class 

... because it is not required and inheriting designate::params is
enough. Reducing scope of inheritance allows us to decouple individual
classes.

Change-Id: Iacb44a1d485c475bcb3a0be053c8ed7a60399866
This commit is contained in:
Takashi Kajinami 2022-02-14 09:16:13 +09:00
parent 913b9a5af4
commit e586326e77
7 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/agent.pp
View File

@ -45,7 +45,7 @@ class designate::agent (
$workers = $::os_workers,
$threads = $::os_service_default,
$listen = $::os_service_default,
) inherits designate {
) inherits designate::params {
include designate::deps

2
manifests/central.pp
View File

@ -79,7 +79,7 @@ class designate::central (
$scheduler_filters = $::os_service_default,
# DEPRECATED PARAMETERS
$max_domain_name_len = undef,
) inherits designate {
) inherits designate::params {
include designate::deps
include designate::db

2
manifests/mdns.pp
View File

@ -65,7 +65,7 @@ class designate::mdns (
$storage_driver = $::os_service_default,
$max_message_size = $::os_service_default,
$listen = $::os_service_default,
) inherits designate {
) inherits designate::params {
include designate::deps
include designate::db

2
manifests/producer.pp
View File

@ -48,7 +48,7 @@ class designate::producer (
$enabled_tasks = $::os_service_default,
# DEPRECATED PARAMETERS
$backend_url = undef,
) inherits designate {
) inherits designate::params {
designate_config {
'service:producer/workers' : value => $workers;

2
manifests/sink.pp
View File

@ -32,7 +32,7 @@ class designate::sink (
$enabled = true,
$manage_service = true,
$enabled_notification_handlers = undef,
) inherits designate {
) inherits designate::params {
include designate::deps

12
manifests/worker.pp
View File

@ -9,9 +9,8 @@
# Defaults to 'present'
#
# [*worker_package_name*]
# (optional) Name of the package containing worker
# resources. Defaults to worker_package_name from
# designate::params
# (optional) Name of the package containing worker resources.
# Defaults to worker_package_name from designate::params
#
# [*enabled*]
# (optional) Whether to enable services.
@ -74,7 +73,7 @@
#
class designate::worker(
$package_ensure = present,
$worker_package_name = undef,
$worker_package_name = $::designate::params::worker_package_name,
$enabled = true,
$manage_service = true,
$workers = $::os_workers,
@ -90,10 +89,9 @@ class designate::worker(
$worker_notify = undef,
$manage_package = undef,
$service_ensure = undef,
) {
) inherits designate::params {
include designate::deps
include designate::params
if $manage_package != undef {
warning('manage_package is dperecated and has no effect')
@ -106,7 +104,7 @@ class designate::worker(
designate::generic_service { 'worker':
package_ensure => $package_ensure,
enabled => $enabled,
package_name => pick($worker_package_name, $::designate::params::worker_package_name),
package_name => $worker_package_name,
manage_service => $manage_service,
service_name => $::designate::params::worker_service_name,
}

2
manifests/zone_manager.pp
View File

@ -45,7 +45,7 @@ class designate::zone_manager (
$threads = $::os_service_default,
$enabled_tasks = $::os_service_default,
$export_synchronous = $::os_service_default,
) inherits designate {
) inherits designate::params {
designate_config {
'service:zone_manager/workers' : value => $workers;