Prepare for voxpupuli-puppet-lint-plugins

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

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

manifests/api.pp

@@ -50,9 +50,7 @@ class vitrage::api (
   $enable_proxy_headers_parsing = $facts['os_service_default'],
   $max_request_body_size        = $facts['os_service_default'],
 ) inherits vitrage::params {
-
   include vitrage::deps
-  include vitrage::params
   include vitrage::policy
 
   package { 'vitrage-api':
@@ -102,5 +100,4 @@ as a standalone service, or httpd for being run by a httpd server")
     enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
     max_request_body_size        => $max_request_body_size,
   }
-
 }

manifests/client.pp

@@ -9,7 +9,6 @@
 class vitrage::client (
   $ensure = 'present'
 ) {
-
   include vitrage::deps
   include vitrage::params
 
@@ -18,6 +17,4 @@ class vitrage::client (
     name   => $vitrage::params::client_package_name,
     tag    => 'openstack',
   }
-
 }
-

manifests/config.pp

@@ -27,7 +27,6 @@ class vitrage::config (
   Hash $vitrage_config        = {},
   Hash $vitrage_api_paste_ini = {},
 ) {
-
   include vitrage::deps
 
   create_resources('vitrage_config', $vitrage_config)

manifests/coordination.pp

@@ -11,10 +11,9 @@
 class vitrage::coordination (
   $backend_url = $facts['os_service_default'],
 ) {
-
   include vitrage::deps
 
-  oslo::coordination{ 'vitrage_config':
+  oslo::coordination { 'vitrage_config':
     backend_url => $backend_url,
   }
 }

manifests/db.pp

@@ -54,7 +54,6 @@ class vitrage::db (
   $database_pool_timeout            = $facts['os_service_default'],
   $mysql_enable_ndb                 = $facts['os_service_default'],
 ) {
-
   include vitrage::deps
 
   oslo::db { 'vitrage_config':
@@ -68,5 +67,4 @@ class vitrage::db (
     pool_timeout            => $database_pool_timeout,
     mysql_enable_ndb        => $mysql_enable_ndb,
   }
-
 }

manifests/db/mysql.pp

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

manifests/db/postgresql.pp

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

manifests/db/sync.pp

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

manifests/graph.pp

@@ -18,11 +18,10 @@ class vitrage::graph (
   Boolean $enabled        = true,
   $package_ensure         = 'present',
 ) {
-
   include vitrage::deps
   include vitrage::params
 
-  package{ 'vitrage-graph':
+  package { 'vitrage-graph':
     ensure => $package_ensure,
     name   => $vitrage::params::graph_package_name,
     tag    => ['openstack', 'vitrage-package'],

manifests/init.pp

@@ -215,7 +215,6 @@ class vitrage (
   # DEPRECATED PARAMETERS
   $rabbit_heartbeat_in_pthread        = undef,
 ) inherits vitrage::params {
-
   include vitrage::deps
 
   package { 'vitrage':
@@ -272,4 +271,3 @@ class vitrage (
     'datasources/types':              value => join(any2array($types), ',');
   }
 }
-

manifests/keystone/auth.pp

@@ -98,7 +98,6 @@ class vitrage::keystone::auth (
   Keystone::EndpointUrl $internal_url     = 'http://127.0.0.1:8999',
   Keystone::EndpointUrl $admin_url        = 'http://127.0.0.1:8999',
 ) {
-
   include vitrage::deps
 
   $real_service_name = pick($service_name, $auth_name)
@@ -125,5 +124,4 @@ class vitrage::keystone::auth (
     internal_url        => $internal_url,
     admin_url           => $admin_url,
   }
-
 }

manifests/keystone/authtoken.pp

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

manifests/logging.pp

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

manifests/notifier.pp

@@ -23,7 +23,6 @@ class vitrage::notifier (
   $package_ensure         = 'present',
   $notifiers              = $facts['os_service_default'],
 ) {
-
   include vitrage::deps
   include vitrage::params
 

manifests/params.pp

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

manifests/persistor.pp

@@ -18,11 +18,10 @@ class vitrage::persistor (
   Boolean $enabled        = true,
   $package_ensure         = 'present',
 ) {
-
   include vitrage::deps
   include vitrage::params
 
-  package{ 'vitrage-persistor':
+  package { 'vitrage-persistor':
     ensure => $package_ensure,
     name   => $vitrage::params::persistor_package_name,
     tag    => ['openstack', 'vitrage-package'],

manifests/policy.pp

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

manifests/service_credentials.pp

@@ -60,7 +60,6 @@ class vitrage::service_credentials (
   $cacert              = $facts['os_service_default'],
   $interface           = $facts['os_service_default'],
 ) {
-
   include vitrage::deps
 
   if is_service_default($system_scope) {

manifests/wsgi/apache.pp

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