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

@@ -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' }
 

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
-
 }

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)

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':

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':

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':

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']
-
 }

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']
-
 }

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':

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
 

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'],
   }
-
 }

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':

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
 

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,
   }
-
 }

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 {

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
 

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':

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
 

manifests/params.pp

@@ -49,6 +49,5 @@ class aodh::params {
     default: {
       fail("Unsupported osfamily: ${facts['os']['family']}")
     }
-
   }
 }

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
 

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;
   }
-
 }

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':

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) {

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

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' {