Prepare for voxpupuli-puppet-lint-plugins

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

Change-Id: I3c303e2ef3ec45059b295b02d6ec84e006edf724
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>

manifests/api.pp

@@ -61,7 +61,6 @@ class cloudkitty::api (
   $enable_proxy_headers_parsing = $facts['os_service_default'],
   $max_request_body_size        = $facts['os_service_default'],
 ) {
-
   include cloudkitty
   include cloudkitty::deps
   include cloudkitty::params
@@ -118,5 +117,4 @@ class cloudkitty::api (
     enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
     max_request_body_size        => $max_request_body_size,
   }
-
 }

manifests/client.pp

@@ -11,7 +11,6 @@
 class cloudkitty::client (
   $ensure = 'present'
 ) {
-
   include cloudkitty::deps
   include cloudkitty::params
 
@@ -20,5 +19,4 @@ class cloudkitty::client (
     name   => $cloudkitty::params::client_package_name,
     tag    => 'openstack',
   }
-
 }

manifests/config.pp

@@ -27,7 +27,6 @@ class cloudkitty::config (
   Hash $cloudkitty_config        = {},
   Hash $cloudkitty_api_paste_ini = {},
 ) {
-
   include cloudkitty::deps
 
   create_resources('cloudkitty_config', $cloudkitty_config)

manifests/cors.pp

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

manifests/db.pp

@@ -54,7 +54,6 @@ class cloudkitty::db (
   $database_pool_timeout            = $facts['os_service_default'],
   $mysql_enable_ndb                 = $facts['os_service_default'],
 ) {
-
   include cloudkitty::deps
 
   oslo::db { 'cloudkitty_config':

manifests/db/mysql.pp

@@ -33,7 +33,7 @@
 #   Only used with mysql modules >= 2.2.
 #   Defaults to 'utf8_general_ci'
 #
-class cloudkitty::db::mysql(
+class cloudkitty::db::mysql (
   String[1] $password,
   $dbname        = 'cloudkitty',
   $user          = 'cloudkitty',
@@ -42,7 +42,6 @@ class cloudkitty::db::mysql(
   $collate       = 'utf8_general_ci',
   $allowed_hosts = undef
 ) {
-
   include cloudkitty::deps
 
   openstacklib::db::mysql { 'cloudkitty':
@@ -58,5 +57,4 @@ class cloudkitty::db::mysql(
   Anchor['cloudkitty::db::begin']
   ~> Class['cloudkitty::db::mysql']
   ~> Anchor['cloudkitty::db::end']
-
 }

manifests/db/postgresql.pp

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

manifests/db/sync.pp

@@ -12,17 +12,16 @@
 #   (Optional) Timeout for the execution of the db_sync
 #   Defaults to 300
 #
-class cloudkitty::db::sync(
+class cloudkitty::db::sync (
   $extra_params    = undef,
   $db_sync_timeout = 300,
 ) {
-
   include cloudkitty::deps
   include cloudkitty::params
 
   exec { 'cloudkitty-db-sync':
     command     => "cloudkitty-dbsync upgrade ${extra_params}",
-    path        => [ '/bin', '/usr/bin', ],
+    path        => ['/bin', '/usr/bin'],
     user        => $cloudkitty::params::user,
     refreshonly => true,
     try_sleep   => 5,

manifests/deps.pp

@@ -57,5 +57,4 @@ class cloudkitty::deps {
   # Installation or config changes will always restart services.
   Anchor['cloudkitty::install::end'] ~> Anchor['cloudkitty::service::begin']
   Anchor['cloudkitty::config::end']  ~> Anchor['cloudkitty::service::begin']
-
 }

manifests/fetcher/gnocchi.pp

@@ -40,7 +40,7 @@
 #   value)
 #   Defaults to $facts['os_service_default'].
 #
-class cloudkitty::fetcher::gnocchi(
+class cloudkitty::fetcher::gnocchi (
   String $scope_attribute   = $facts['os_service_default'],
   String $resource_types    = $facts['os_service_default'],
   String $gnocchi_auth_type = $facts['os_service_default'],
@@ -50,7 +50,7 @@ class cloudkitty::fetcher::gnocchi(
   String $region_name       = $facts['os_service_default'],
   String $auth_type         = $facts['os_service_default'],
   String $auth_section      = $facts['os_service_default'],
-){
+) {
   include cloudkitty::deps
 
   cloudkitty_config {

manifests/fetcher/keystone.pp

@@ -67,7 +67,6 @@ class cloudkitty::fetcher::keystone (
   $ignore_rating_role      = $facts['os_service_default'],
   $ignore_disabled_tenants = $facts['os_service_default'],
 ) {
-
   include cloudkitty::deps
 
   if is_service_default($system_scope) {

manifests/healthcheck.pp

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

manifests/init.pp

@@ -222,7 +222,7 @@
 #   will be run through a green thread.
 #   Defaults to undef
 #
-class cloudkitty(
+class cloudkitty (
   $package_ensure                     = 'present',
   $rabbit_use_ssl                     = $facts['os_service_default'],
   $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
@@ -270,7 +270,6 @@ class cloudkitty(
   # DEPRECATED PARAMETERS
   $rabbit_heartbeat_in_pthread        = undef,
 ) {
-
   include cloudkitty::params
   include cloudkitty::db
   include cloudkitty::deps

manifests/keystone/auth.pp

@@ -107,7 +107,6 @@ class cloudkitty::keystone::auth (
   Boolean $manage_rating_role             = true,
   String[1] $rating_role                  = 'rating',
 ) {
-
   include cloudkitty::deps
 
   Keystone::Resource::Service_identity['cloudkitty'] -> Anchor['cloudkitty::service::end']
@@ -138,5 +137,4 @@ class cloudkitty::keystone::auth (
       ensure => present,
     }
   }
-
 }

manifests/keystone/authtoken.pp

@@ -190,7 +190,7 @@
 #  "public", "internal" or "admin".
 #  Defaults to $facts['os_service_default'].
 #
-class cloudkitty::keystone::authtoken(
+class cloudkitty::keystone::authtoken (
   String[1] $password,
   $username                       = 'cloudkitty',
   $auth_url                       = 'http://localhost:5000',
@@ -229,7 +229,6 @@ class cloudkitty::keystone::authtoken(
   $service_type                   = $facts['os_service_default'],
   $interface                      = $facts['os_service_default'],
 ) {
-
   include cloudkitty::deps
 
   keystone::resource::authtoken { 'cloudkitty_config':
@@ -272,4 +271,3 @@ class cloudkitty::keystone::authtoken(
     interface                      => $interface,
   }
 }
-

manifests/logging.pp

@@ -101,7 +101,7 @@
 #   Defaults to $facts['os_service_default']
 #   Example: 'Y-%m-%d %H:%M:%S'
 #
-class cloudkitty::logging(
+class cloudkitty::logging (
   $use_syslog                    = $facts['os_service_default'],
   $use_json                      = $facts['os_service_default'],
   $use_journal                   = $facts['os_service_default'],
@@ -122,7 +122,6 @@ class cloudkitty::logging(
   $instance_uuid_format          = $facts['os_service_default'],
   $log_date_format               = $facts['os_service_default'],
 ) {
-
   include cloudkitty::deps
 
   oslo::log { 'cloudkitty_config':

manifests/orchestrator.pp

@@ -21,10 +21,9 @@ class cloudkitty::orchestrator (
   $max_workers      = $facts['os_service_default'],
   $max_threads      = $facts['os_service_default']
 ) {
-
   include cloudkitty::deps
 
-  oslo::coordination{ 'cloudkitty_config':
+  oslo::coordination { 'cloudkitty_config':
     backend_url   => $coordination_url,
     manage_config => false,
   }

manifests/params.pp

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

manifests/policy.pp

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

manifests/processor.pp

@@ -66,7 +66,6 @@ class cloudkitty::processor (
   $region_name            = $facts['os_service_default'],
   $interface              = $facts['os_service_default'],
 ) {
-
   include cloudkitty::deps
   include cloudkitty::params
 
@@ -112,5 +111,4 @@ class cloudkitty::processor (
     'collector_gnocchi/region_name':  value => $region_name;
     'collector_gnocchi/interface':    value => $interface;
   }
-
 }

manifests/storage.pp

@@ -8,10 +8,9 @@
 #   to the cloudkitty-storage-init command.
 #   Defaults to ''
 #
-class cloudkitty::storage(
+class cloudkitty::storage (
   $extra_params = ''
-){
-
+) {
   include cloudkitty::deps
   include cloudkitty::params
 

manifests/storage/elasticsearch.pp

@@ -15,14 +15,13 @@
 #   Duration (in seconds) for which the ES scroll contexts should be kept
 #   alive. (interer value)
 #
-class cloudkitty::storage::elasticsearch(
+class cloudkitty::storage::elasticsearch (
   String                     $host            = $facts['os_service_default'],
   String                     $index_name      = $facts['os_service_default'],
   Variant[String[0],Boolean] $insecure        = $facts['os_service_default'],
   String                     $cafile          = $facts['os_service_default'],
   Variant[String[0],Integer] $scroll_duration = $facts['os_service_default'],
-){
-
+) {
   include cloudkitty::deps
 
   cloudkitty_config {

manifests/storage/influxdb.pp

@@ -24,7 +24,7 @@
 #   Path of the CA certificate to trust for HTTPS
 #   connections (string value)
 #
-class cloudkitty::storage::influxdb(
+class cloudkitty::storage::influxdb (
   String                     $username         = $facts['os_service_default'],
   String                     $password         = $facts['os_service_default'],
   String                     $database         = $facts['os_service_default'],
@@ -34,8 +34,7 @@ class cloudkitty::storage::influxdb(
   Variant[String[0],Boolean] $use_ssl          = $facts['os_service_default'],
   Variant[String[0],Boolean] $insecure         = $facts['os_service_default'],
   String                     $cafile           = $facts['os_service_default'],
-){
-
+) {
   include cloudkitty::deps
 
   cloudkitty_config {

manifests/wsgi/apache.pp

@@ -148,7 +148,6 @@ class cloudkitty::wsgi::apache (
   $headers                     = undef,
   $request_headers             = undef,
 ) {
-
   include cloudkitty::deps
   include cloudkitty::params
 

manifests/wsgi/uwsgi.pp

@@ -25,11 +25,10 @@ class cloudkitty::wsgi::uwsgi (
   $processes         = $facts['os_workers'],
   $threads           = 32,
   $listen_queue_size = 100,
-){
-
+) {
   include cloudkitty::deps
 
-  if $facts['os']['name'] != 'Debian'{
+  if $facts['os']['name'] != 'Debian' {
     warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.')
   }