From 3cc75b873e85d043d93fbb92f9f17274791a355d Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 19 Aug 2025 21:49:05 +0900
Subject: [PATCH] Prepare for voxpupuli-puppet-lint-plugins

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

Change-Id: I755dd233b7d9991cde8a5b1ae76cdb479afa3c25
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
---
 manifests/api.pp                 | 2 --
 manifests/client.pp              | 2 --
 manifests/config.pp              | 1 -
 manifests/coordination.pp        | 1 -
 manifests/cors.pp                | 1 -
 manifests/db.pp                  | 1 -
 manifests/db/mysql.pp            | 4 +---
 manifests/db/postgresql.pp       | 4 +---
 manifests/db/sync.pp             | 1 -
 manifests/evaluator.pp           | 1 -
 manifests/expirer.pp             | 2 --
 manifests/healthcheck.pp         | 1 -
 manifests/init.pp                | 1 -
 manifests/keystone/auth.pp       | 2 --
 manifests/keystone/authtoken.pp  | 3 +--
 manifests/listener.pp            | 1 -
 manifests/logging.pp             | 1 -
 manifests/notifier.pp            | 1 -
 manifests/params.pp              | 1 -
 manifests/policy.pp              | 1 -
 manifests/quota.pp               | 2 --
 manifests/reports.pp             | 1 -
 manifests/service_credentials.pp | 1 -
 manifests/wsgi/apache.pp         | 1 -
 manifests/wsgi/uwsgi.pp          | 3 +--
 25 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/manifests/api.pp b/manifests/api.pp
index ce26bd78..9440e719 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -65,7 +65,6 @@ class aodh::api (
   $gnocchi_external_project_owner = 'services',
   $gnocchi_external_domain_name   = 'Default',
 ) inherits aodh::params {
-
   include aodh::deps
   include aodh::params
   include aodh::policy
@@ -105,7 +104,6 @@ class aodh::api (
       Aodh_api_paste_ini<||> ~> Service['aodh-api']
       # On any uwsgi config change, we must restart Aodh API.
       Aodh_api_uwsgi_config<||> ~> Service['aodh-api']
-
     } elsif $service_name == 'httpd' {
       Service <| title == 'httpd' |> { tag +> 'aodh-service' }
 
diff --git a/manifests/client.pp b/manifests/client.pp
index 16498b6d..200c3fb6 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -9,7 +9,6 @@
 class aodh::client (
   $ensure = 'present'
 ) {
-
   include aodh::deps
   include aodh::params
 
@@ -20,5 +19,4 @@ class aodh::client (
   }
 
   include openstacklib::openstackclient
-
 }
diff --git a/manifests/config.pp b/manifests/config.pp
index 004aa074..3636eb33 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -27,7 +27,6 @@ class aodh::config (
   Hash $aodh_config        = {},
   Hash $aodh_api_paste_ini = {},
 ) {
-
   include aodh::deps
 
   create_resources('aodh_config', $aodh_config)
diff --git a/manifests/coordination.pp b/manifests/coordination.pp
index e040f31f..5265beba 100644
--- a/manifests/coordination.pp
+++ b/manifests/coordination.pp
@@ -29,7 +29,6 @@ class aodh::coordination (
   $retry_backoff      = $facts['os_service_default'],
   $max_retry_interval = $facts['os_service_default'],
 ) {
-
   include aodh::deps
 
   oslo::coordination { 'aodh_config':
diff --git a/manifests/cors.pp b/manifests/cors.pp
index 6b1efb28..6f2bd40e 100644
--- a/manifests/cors.pp
+++ b/manifests/cors.pp
@@ -44,7 +44,6 @@ class aodh::cors (
   $allow_methods     = $facts['os_service_default'],
   $allow_headers     = $facts['os_service_default'],
 ) {
-
   include aodh::deps
 
   oslo::cors { 'aodh_config':
diff --git a/manifests/db.pp b/manifests/db.pp
index dcf7e7e8..36c41b04 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -59,7 +59,6 @@ class aodh::db (
   $database_pool_timeout            = $facts['os_service_default'],
   $mysql_enable_ndb                 = $facts['os_service_default'],
 ) {
-
   include aodh::deps
 
   oslo::db { 'aodh_config':
diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index bfa6b144..61768d25 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -33,7 +33,7 @@
 #   Only used with mysql modules >= 2.2.
 #   Defaults to 'utf8_general_ci'
 #
-class aodh::db::mysql(
+class aodh::db::mysql (
   String[1] $password,
   $dbname        = 'aodh',
   $user          = 'aodh',
@@ -42,7 +42,6 @@ class aodh::db::mysql(
   $collate       = 'utf8_general_ci',
   $allowed_hosts = undef
 ) {
-
   include aodh::deps
 
   openstacklib::db::mysql { 'aodh':
@@ -58,5 +57,4 @@ class aodh::db::mysql(
   Anchor['aodh::db::begin']
   ~> Class['aodh::db::mysql']
   ~> Anchor['aodh::db::end']
-
 }
diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp
index 017bbf74..a060b04c 100644
--- a/manifests/db/postgresql.pp
+++ b/manifests/db/postgresql.pp
@@ -24,14 +24,13 @@
 #    (Optional) Privileges given to the database user.
 #    Default to 'ALL'
 #
-class aodh::db::postgresql(
+class aodh::db::postgresql (
   $password,
   $dbname     = 'aodh',
   $user       = 'aodh',
   $encoding   = undef,
   $privileges = 'ALL',
 ) {
-
   include aodh::deps
 
   openstacklib::db::postgresql { 'aodh':
@@ -45,5 +44,4 @@ class aodh::db::postgresql(
   Anchor['aodh::db::begin']
   ~> Class['aodh::db::postgresql']
   ~> Anchor['aodh::db::end']
-
 }
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index 833e1b88..b30d293c 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -13,7 +13,6 @@ class aodh::db::sync (
   $user            = $aodh::params::user,
   $db_sync_timeout = 300,
 ) inherits aodh::params {
-
   include aodh::deps
 
   exec { 'aodh-db-sync':
diff --git a/manifests/evaluator.pp b/manifests/evaluator.pp
index 8bf7e8f1..d0bd3a52 100644
--- a/manifests/evaluator.pp
+++ b/manifests/evaluator.pp
@@ -39,7 +39,6 @@ class aodh::evaluator (
   $event_alarm_cache_ttl    = $facts['os_service_default'],
   $additional_ingestion_lag = $facts['os_service_default'],
 ) {
-
   include aodh::deps
   include aodh::params
 
diff --git a/manifests/expirer.pp b/manifests/expirer.pp
index c794bc56..e8b0c5eb 100644
--- a/manifests/expirer.pp
+++ b/manifests/expirer.pp
@@ -49,7 +49,6 @@ class aodh::expirer (
   Integer[0] $maxdelay               = 0,
   $alarm_histories_delete_batch_size = $facts['os_service_default'],
 ) {
-
   include aodh::params
   include aodh::deps
 
@@ -81,5 +80,4 @@ class aodh::expirer (
     weekday     => $weekday,
     require     => Anchor['aodh::dbsync::end'],
   }
-
 }
diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp
index 3f179fb9..17bd0457 100644
--- a/manifests/healthcheck.pp
+++ b/manifests/healthcheck.pp
@@ -46,7 +46,6 @@ class aodh::healthcheck (
   $disable_by_file_paths   = $facts['os_service_default'],
   $enable_by_file_paths    = $facts['os_service_default'],
 ) {
-
   include aodh::deps
 
   oslo::healthcheck { 'aodh_config':
diff --git a/manifests/init.pp b/manifests/init.pp
index 3f45bf04..84e2146c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -243,7 +243,6 @@ class aodh (
   # DEPRECATED PARAMETERS
   $rabbit_heartbeat_in_pthread        = undef,
 ) inherits aodh::params {
-
   include aodh::deps
   include aodh::db
 
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index dfbc230d..22efd998 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -98,7 +98,6 @@ class aodh::keystone::auth (
   Keystone::EndpointUrl $internal_url     = 'http://127.0.0.1:8042',
   Keystone::EndpointUrl $admin_url        = 'http://127.0.0.1:8042',
 ) {
-
   include aodh::deps
 
   Keystone::Resource::Service_identity['aodh'] -> Anchor['aodh::service::end']
@@ -123,5 +122,4 @@ class aodh::keystone::auth (
     internal_url        => $internal_url,
     admin_url           => $admin_url,
   }
-
 }
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index a7f3ae33..01ac7ec2 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -194,7 +194,7 @@
 #  (Optional) Hash of additional parameters to pass through to the keystone
 #  authtoken class. Values set here override the individual parameters above.
 #
-class aodh::keystone::authtoken(
+class aodh::keystone::authtoken (
   String[1] $password,
   $username                       = 'aodh',
   $auth_url                       = 'http://localhost:5000',
@@ -234,7 +234,6 @@ class aodh::keystone::authtoken(
   $interface                      = $facts['os_service_default'],
   $params                         = {},
 ) {
-
   include aodh::deps
 
   keystone::resource::authtoken {
diff --git a/manifests/listener.pp b/manifests/listener.pp
index d78c1289..a22a8606 100644
--- a/manifests/listener.pp
+++ b/manifests/listener.pp
@@ -39,7 +39,6 @@ class aodh::listener (
   $batch_size             = $facts['os_service_default'],
   $batch_timeout          = $facts['os_service_default'],
 ) {
-
   include aodh::deps
   include aodh::params
 
diff --git a/manifests/logging.pp b/manifests/logging.pp
index 390898b9..58724a96 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -119,7 +119,6 @@ class aodh::logging (
   $instance_uuid_format          = $facts['os_service_default'],
   $log_date_format               = $facts['os_service_default'],
 ) {
-
   include aodh::deps
 
   oslo::log { 'aodh_config':
diff --git a/manifests/notifier.pp b/manifests/notifier.pp
index 323a561f..515011a6 100644
--- a/manifests/notifier.pp
+++ b/manifests/notifier.pp
@@ -35,7 +35,6 @@ class aodh::notifier (
   $batch_size             = $facts['os_service_default'],
   $batch_timeout          = $facts['os_service_default'],
 ) {
-
   include aodh::deps
   include aodh::params
 
diff --git a/manifests/params.pp b/manifests/params.pp
index 1fd9251e..2761fa07 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -49,6 +49,5 @@ class aodh::params {
     default: {
       fail("Unsupported osfamily: ${facts['os']['family']}")
     }
-
   }
 }
diff --git a/manifests/policy.pp b/manifests/policy.pp
index 4e695e9a..1e4cc636 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -54,7 +54,6 @@ class aodh::policy (
   $policy_dirs          = $facts['os_service_default'],
   Boolean $purge_config = false,
 ) {
-
   include aodh::deps
   include aodh::params
 
diff --git a/manifests/quota.pp b/manifests/quota.pp
index 1affb04c..f5a9809b 100644
--- a/manifests/quota.pp
+++ b/manifests/quota.pp
@@ -19,7 +19,6 @@ class aodh::quota (
   $project_alarm_quota = $facts['os_service_default'],
   $alarm_max_actions   = $facts['os_service_default'],
 ) {
-
   include aodh::deps
   include aodh::params
 
@@ -28,5 +27,4 @@ class aodh::quota (
     'api/project_alarm_quota': value => $project_alarm_quota;
     'api/alarm_max_actions':   value => $alarm_max_actions;
   }
-
 }
diff --git a/manifests/reports.pp b/manifests/reports.pp
index 4816b176..92b60ea0 100644
--- a/manifests/reports.pp
+++ b/manifests/reports.pp
@@ -22,7 +22,6 @@ class aodh::reports (
   $file_event_handler          = $facts['os_service_default'],
   $file_event_handler_interval = $facts['os_service_default'],
 ) {
-
   include aodh::deps
 
   oslo::reports { 'aodh_config':
diff --git a/manifests/service_credentials.pp b/manifests/service_credentials.pp
index 5126da9e..84be7231 100644
--- a/manifests/service_credentials.pp
+++ b/manifests/service_credentials.pp
@@ -61,7 +61,6 @@ class aodh::service_credentials (
   $cacert              = $facts['os_service_default'],
   $interface           = $facts['os_service_default'],
 ) {
-
   include aodh::deps
 
   if is_service_default($system_scope) {
diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 8220f717..b3a0b843 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -176,7 +176,6 @@ class aodh::wsgi::apache (
   $request_headers             = undef,
   $vhost_custom_fragment       = undef,
 ) inherits aodh::params {
-
   include aodh::deps
 
   # NOTE(aschultz): needed because the packaging may introduce some apache
diff --git a/manifests/wsgi/uwsgi.pp b/manifests/wsgi/uwsgi.pp
index 400ab99b..fd5a66fc 100644
--- a/manifests/wsgi/uwsgi.pp
+++ b/manifests/wsgi/uwsgi.pp
@@ -25,8 +25,7 @@ class aodh::wsgi::uwsgi (
   $processes         = $facts['os_workers'],
   $threads           = 32,
   $listen_queue_size = 100,
-){
-
+) {
   include aodh::deps
 
   if $facts['os']['name'] != 'Debian' {