openstack/puppet-designate
Code Issues Proposed changes

Prepare for voxpupuli-puppet-lint-plugins

Browse Source 
Fix new lint errors detected when full of the voxpupili lint plugins
are enabled.

Change-Id: I9705ad334d05a2041f0f9c4b885fc3fd44342720
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-19 23:11:38 +09:00
parent 0d497d714e
commit 8f560f1de1
39 changed files with 25 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
example/all-in-one-keystone.pp
View File

@@ -5,7 +5,6 @@
# dig www.example.net @127.0.0.1 +short
#
node /designate/ {
include apt
include rabbitmq
include mysql::server
@@ -25,7 +24,7 @@ node /designate/ {
# == Keystone == #
class { 'keystone::db::mysql':
password => $keystone_db_password,
allowed_hosts => '%',
allowed_hosts => '%',
}
class { 'keystone':
@@ -35,26 +34,25 @@ node /designate/ {
admin_token => $keystone_admin_token,
token_provider => 'keystone.token.providers.uuid.Provider',
token_driver => 'keystone.token.backends.sql.Token',
database_connection => "mysql://keystone:${keystone_db_password}@${keystone_db_host}/keystone",
database_connection => "mysql://keystone:${keystone_db_password}@${keystone_db_host}/keystone",
}
## Adds the admin credential to keystone.
class { 'keystone::roles::admin':
email => 'admin@example.com',
password => $keystone_password,
password => $keystone_password,
admin_tenant => 'admin',
}
## Installs the service user endpoint.
class { 'keystone::endpoint': }
# == Designate == #
class {'designate::db::mysql':
class { 'designate::db::mysql':
password => $designate_db_password,
}
class {'designate':
class { 'designate':
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => '127.0.0.1',
@@ -64,12 +62,12 @@ node /designate/ {
}),
}
class {'designate::db':
class { 'designate::db':
database_connection => "mysql://designate:${designate_db_password}@${db_host}/designate",
}
include designate::client
class {'designate::api':
class { 'designate::api':
auth_strategy => $auth_strategy,
keystone_password => $keystone_password,
}
@@ -77,12 +75,12 @@ node /designate/ {
include designate::central
include designate::dns
class {'designate::backend::bind9':
class { 'designate::backend::bind9':
rndc_config_file => '',
rndc_key_file => '',
}
class {'designate::keystone::auth':
class { 'designate::keystone::auth':
password => $keystone_password,
}
}

11
example/all-in-one-noauth.pp
View File

@@ -1,5 +1,4 @@
node /designate/ {
include apt
include rabbitmq
include mysql::server
@@ -9,16 +8,14 @@ node /designate/ {
$designate_db_password = 'admin'
$db_host = '127.0.0.1'
include designate::dns
include designate::backend::bind9
class {'designate::db::mysql':
class { 'designate::db::mysql':
password => $designate_db_password,
}
class {'designate':
class { 'designate':
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => '127.0.0.1',
@@ -28,11 +25,11 @@ node /designate/ {
}),
}
class {'designate::db':
class { 'designate::db':
database_connection => "mysql://designate:${designate_db_password}@${db_host}/designate",
}
class {'designate::api':
class { 'designate::api':
auth_strategy => $auth_strategy,
}

2
manifests/api.pp
View File

@@ -131,7 +131,6 @@ class designate::api (
$max_request_body_size = $facts['os_service_default'],
$service_name = $designate::params::api_service_name,
) inherits designate {
include designate::deps
include designate::policy
@@ -179,7 +178,6 @@ class designate::api (
# On any paste-api.ini config change, we must restart Designate API.
Designate_api_paste_ini<||> ~> Service[$service_name]
} else {
$service_name_real = $service_name

3
manifests/backend/bind9.pp
View File

@@ -63,7 +63,7 @@ class designate::backend::bind9 (
$rndc_key_file = undef,
$rndc_controls = undef,
$rndc_port = undef,
Hash[Integer, String] $ns_records = {1 => 'ns1.example.org.'},
Hash[Integer, String] $ns_records = { 1 => 'ns1.example.org.' },
Array[String[1], 1] $nameservers = ['127.0.0.1'],
Array[String[1], 1] $bind9_hosts = ['127.0.0.1'],
$dns_port = 53,
@@ -73,7 +73,6 @@ class designate::backend::bind9 (
Array[String[1]] $also_notifies = [],
Hash[String[1], String[1]] $attributes = {},
) {
include designate::deps
include designate::params

1
manifests/backend/pdns4.pp
View File

@@ -52,7 +52,6 @@ class designate::backend::pdns4 (
Array[String[1]] $also_notifies = [],
Hash[String[1], String[1]] $attributes = {},
) {
include designate::deps
include designate::params

1
manifests/central.pp
View File

@@ -71,7 +71,6 @@ class designate::central (
$default_pool_id = $facts['os_service_default'],
$scheduler_filters = $facts['os_service_default'],
) inherits designate::params {
include designate::deps
include designate::db

2
manifests/client.pp
View File

@@ -16,7 +16,6 @@ class designate::client (
$package_ensure = 'present',
$client_package_name = $designate::params::client_package_name,
) inherits designate::params {
include designate::deps
package { 'python-designateclient':
@@ -26,5 +25,4 @@ class designate::client (
}
include openstacklib::openstackclient
}

1
manifests/config.pp
View File

@@ -35,7 +35,6 @@ class designate::config (
Hash $api_paste_ini_config = {},
Hash $rootwrap_config = {},
) {
include designate::deps
create_resources('designate_config', $designate_config)

3
manifests/coordination.pp
View File

@@ -23,10 +23,9 @@ class designate::coordination (
$heartbeat_interval = $facts['os_service_default'],
$run_watchers_interval = $facts['os_service_default'],
) {
include designate::deps
oslo::coordination{ 'designate_config':
oslo::coordination { 'designate_config':
backend_url => $backend_url,
}

1
manifests/cors.pp
View File

@@ -44,7 +44,6 @@ class designate::cors (
$allow_methods = $facts['os_service_default'],
$allow_headers = $facts['os_service_default'],
) {
include designate::deps
oslo::cors { 'designate_config':

1
manifests/db.pp
View File

@@ -62,7 +62,6 @@ class designate::db (
$mysql_enable_ndb = $facts['os_service_default'],
Boolean $sync_db = true,
) {
include designate::deps
oslo::db { 'designate_config':

4
manifests/db/mysql.pp
View File

@@ -31,7 +31,7 @@
# (Optional) Additional hosts that are allowed to access this DB
# Defaults to undef
#
class designate::db::mysql(
class designate::db::mysql (
$password,
$dbname = 'designate',
$user = 'designate',
@@ -40,7 +40,6 @@ class designate::db::mysql(
$collate = 'utf8_general_ci',
$allowed_hosts = undef,
) {
include designate::deps
openstacklib::db::mysql { 'designate':
@@ -56,5 +55,4 @@ class designate::db::mysql(
Anchor['designate::db::begin']
~> Class['designate::db::mysql']
~> Anchor['designate::db::end']
}

4
manifests/db/postgresql.pp
View File

@@ -24,14 +24,13 @@
# (Optional) Privileges given to the database user.
# Default to 'ALL'
#
class designate::db::postgresql(
class designate::db::postgresql (
$password,
$dbname = 'designate',
$user = 'designate',
$encoding = undef,
$privileges = 'ALL',
) {
include designate::deps
openstacklib::db::postgresql { 'designate':
@@ -42,7 +41,6 @@ class designate::db::postgresql(
privileges => $privileges,
}
Anchor['designate::db::begin']
~> Class['designate::db::postgresql']
~> Anchor['designate::db::end']

4
manifests/db/sync.pp
View File

@@ -14,11 +14,10 @@
# (Optional) Timeout for the execution of the db_sync
# Defaults to 300
#
class designate::db::sync(
class designate::db::sync (
$extra_params = undef,
$db_sync_timeout = 300,
) {
include designate::deps
include designate::params
@@ -39,5 +38,4 @@ class designate::db::sync(
notify => Anchor['designate::dbsync::end'],
tag => 'openstack-db',
}
}

3
manifests/generic_service.pp
View File

@@ -31,14 +31,13 @@
# (optional) Control the ensure parameter for the package resource.
# Defaults to 'present'.
#
define designate::generic_service(
define designate::generic_service (
$package_name,
$service_name,
Boolean $enabled = false,
Boolean $manage_service = true,
$package_ensure = 'present',
) {
include designate::deps
include designate::params

1
manifests/healthcheck.pp
View File

@@ -46,7 +46,6 @@ class designate::healthcheck (
$disable_by_file_paths = $facts['os_service_default'],
$enable_by_file_paths = $facts['os_service_default'],
) {
include designate::deps
oslo::healthcheck { 'designate_config':

4
manifests/init.pp
View File

@@ -195,7 +195,7 @@
# will be run through a green thread.
# Defaults to undef
#
class designate(
class designate (
$package_ensure = present,
$common_package_name = $designate::params::common_package_name,
$host = $facts['os_service_default'],
@@ -237,7 +237,6 @@ class designate(
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) inherits designate::params {
include designate::deps
package { 'designate-common':
@@ -298,5 +297,4 @@ class designate(
'DEFAULT/default_ttl': value => $default_ttl;
'DEFAULT/supported_record_type': value => join(any2array($supported_record_type), ',');
}
}

1
manifests/keystone.pp
View File

@@ -56,7 +56,6 @@ class designate::keystone (
$status_code_retries = $facts['os_service_default'],
$status_code_retry_delay = $facts['os_service_default'],
) {
include designate::deps
designate_config {

2
manifests/keystone/auth.pp
View File

@@ -106,7 +106,6 @@ class designate::keystone::auth (
Keystone::EndpointUrl $admin_url = 'http://127.0.0.1:9001',
Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:9001',
) {
include designate::deps
Keystone::Resource::Service_identity['designate'] -> Anchor['designate::service::end']
@@ -131,5 +130,4 @@ class designate::keystone::auth (
internal_url => $internal_url,
admin_url => $admin_url,
}
}

3
manifests/keystone/authtoken.pp
View File

@@ -199,7 +199,7 @@
# (Optional) Hash of additional parameters to pass through to the keystone
# authtoken class. Values set here override the individual parameters above.
#
class designate::keystone::authtoken(
class designate::keystone::authtoken (
String[1] $password,
$username = 'designate',
$auth_url = 'http://localhost:5000',
@@ -239,7 +239,6 @@ class designate::keystone::authtoken(
$interface = $facts['os_service_default'],
$params = {}
) {
include designate::deps
keystone::resource::authtoken {

4
manifests/logging.pp
View File

@@ -97,7 +97,7 @@
# Defaults to $facts['os_service_default']
# Example: 'Y-%m-%d %H:%M:%S'
#
class designate::logging(
class designate::logging (
$use_syslog = $facts['os_service_default'],
$use_json = $facts['os_service_default'],
$use_journal = $facts['os_service_default'],
@@ -118,7 +118,6 @@ class designate::logging(
$instance_uuid_format = $facts['os_service_default'],
$log_date_format = $facts['os_service_default'],
) inherits designate::params {
include designate::deps
oslo::log { 'designate_config':
@@ -142,5 +141,4 @@ class designate::logging(
instance_format => $instance_format,
instance_uuid_format => $instance_uuid_format,
}
}

1
manifests/mdns.pp
View File

@@ -66,7 +66,6 @@ class designate::mdns (
$max_message_size = $facts['os_service_default'],
$listen = $facts['os_service_default'],
) inherits designate::params {
include designate::deps
include designate::db

1
manifests/network_api/neutron.pp
View File

@@ -29,5 +29,4 @@ class designate::network_api::neutron (
'network_api:neutron/endpoint_type': value => $endpoint_type;
'network_api:neutron/timeout': value => $timeout;
}
}

2
manifests/policy.pp
View File

@@ -54,7 +54,6 @@ class designate::policy (
$policy_dirs = $facts['os_service_default'],
Boolean $purge_config = false,
) {
include designate::deps
include designate::params
@@ -82,5 +81,4 @@ class designate::policy (
policy_default_rule => $policy_default_rule,
policy_dirs => $policy_dirs,
}
}

1
manifests/producer.pp
View File

@@ -41,7 +41,6 @@ class designate::producer (
$threads = $facts['os_service_default'],
$enabled_tasks = $facts['os_service_default'],
) inherits designate::params {
include designate::deps
designate_config {

1
manifests/producer_task/delayed_notify.pp
View File

@@ -21,7 +21,6 @@ class designate::producer_task::delayed_notify (
$per_page = $facts['os_service_default'],
$batch_size = $facts['os_service_default'],
) {
include designate::deps
designate_config {

1
manifests/producer_task/increment_serial.pp
View File

@@ -21,7 +21,6 @@ class designate::producer_task::increment_serial (
$per_page = $facts['os_service_default'],
$batch_size = $facts['os_service_default'],
) {
include designate::deps
designate_config {

1
manifests/producer_task/periodic_exists.pp
View File

@@ -16,7 +16,6 @@ class designate::producer_task::periodic_exists (
$interval = $facts['os_service_default'],
$per_page = $facts['os_service_default'],
) {
include designate::deps
designate_config {

1
manifests/producer_task/periodic_secondary_refresh.pp
View File

@@ -16,7 +16,6 @@ class designate::producer_task::periodic_secondary_refresh (
$interval = $facts['os_service_default'],
$per_page = $facts['os_service_default'],
) {
include designate::deps
designate_config {

1
manifests/producer_task/worker_periodic_recovery.pp
View File

@@ -16,7 +16,6 @@ class designate::producer_task::worker_periodic_recovery (
$interval = $facts['os_service_default'],
$per_page = $facts['os_service_default'],
) {
include designate::deps
designate_config {

1
manifests/producer_task/zone_purge.pp
View File

@@ -27,7 +27,6 @@ class designate::producer_task::zone_purge (
$time_threshold = $facts['os_service_default'],
$batch_size = $facts['os_service_default'],
) {
include designate::deps
designate_config {

1
manifests/quota.pp
View File

@@ -36,7 +36,6 @@ class designate::quota (
$quota_driver = $facts['os_service_default'],
$quota_recordset_records = $facts['os_service_default'],
) {
include designate::deps
designate_config {

3
manifests/reports.pp
View File

@@ -17,12 +17,11 @@
# is set.
# Defaults to $facts['os_service_default']
#
class designate::reports(
class designate::reports (
$log_dir = $facts['os_service_default'],
$file_event_handler = $facts['os_service_default'],
$file_event_handler_interval = $facts['os_service_default'],
) {
include designate::deps
oslo::reports { 'designate_config':

1
manifests/sink.pp
View File

@@ -43,7 +43,6 @@ class designate::sink (
$threads = $facts['os_service_default'],
$enabled_notification_handlers = $facts['os_service_default'],
) inherits designate::params {
include designate::deps
designate::generic_service { 'sink':

1
manifests/sink/neutron_floatingip.pp
View File

@@ -31,7 +31,6 @@ class designate::sink::neutron_floatingip (
$formatv4 = $facts['os_service_default'],
$formatv6 = $facts['os_service_default'],
) {
include designate::deps
designate_config {

1
manifests/sink/nova_fixed.pp
View File

@@ -31,7 +31,6 @@ class designate::sink::nova_fixed (
$formatv4 = $facts['os_service_default'],
$formatv6 = $facts['os_service_default'],
) {
include designate::deps
designate_config {

3
manifests/worker.pp
View File

@@ -76,7 +76,7 @@
# (Optional) Send all traffic over TCP.
# Defaults to $facts['os_service_default']
#
class designate::worker(
class designate::worker (
$package_ensure = present,
$worker_package_name = $designate::params::worker_package_name,
Boolean $enabled = true,
@@ -96,7 +96,6 @@ class designate::worker(
$serial_timeout = $facts['os_service_default'],
$all_tcp = $facts['os_service_default'],
) inherits designate::params {
include designate::deps
designate::generic_service { 'worker':

1
manifests/wsgi/apache.pp
View File

@@ -150,7 +150,6 @@ class designate::wsgi::apache (
$request_headers = undef,
$vhost_custom_fragment = undef,
) {
include designate::deps
include designate::params

3
manifests/wsgi/uwsgi.pp
View File

@@ -25,8 +25,7 @@ class designate::wsgi::uwsgi (
$processes = $facts['os_workers'],
$threads = 32,
$listen_queue_size = 100,
){
) {
include designate::deps
if $facts['os']['name'] != 'Debian' {