Prepare for voxpupuli-puppet-lint-plugins

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

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

examples/user_project_user_role_composite_namevar.pp

@@ -145,7 +145,6 @@ keystone_user_role { 'user_one@::domain_one':
 }
 # is an error, and will trigger one.
 
-
 # NOTE: for the all examples above to work you have to define:
 keystone_domain { 'domain_one':
   ensure => present,

examples/v3_basic.pp

@@ -1,6 +1,5 @@
 Exec { logoutput => 'on_failure' }
 
-
 class { 'mysql::server': }
 class { 'keystone::db::mysql':
   password => 'keystone',

manifests/bootstrap.pp

@@ -83,7 +83,6 @@ class keystone::bootstrap (
   Boolean $bootstrap                                    = true,
   Boolean $manage_resources                             = true,
 ) inherits keystone::params {
-
   include keystone::deps
 
   $internal_url_real = $internal_url ? {

manifests/cache.pp

@@ -293,7 +293,6 @@ class keystone::cache(
   $application_credential_cache_time    = $facts['os_service_default'],
   Boolean $manage_backend_package       = true,
 ) {
-
   include keystone::deps
 
   if !is_service_default($memcache_servers) {

manifests/config.pp

@@ -23,7 +23,6 @@
 class keystone::config (
   Hash $keystone_config = {},
 ) {
-
   include keystone::deps
 
   create_resources('keystone_config', $keystone_config)

manifests/cors.pp

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

manifests/cron/fernet_rotate.pp

@@ -63,7 +63,6 @@ class keystone::cron::fernet_rotate (
   Integer[0] $maxdelay              = 0,
   $user                             = $keystone::params::user,
 ) inherits keystone::params {
-
   include keystone::deps
 
   if $maxdelay == 0 {

manifests/cron/trust_flush.pp

@@ -72,7 +72,6 @@ class keystone::cron::trust_flush (
   $destination                      = '/var/log/keystone/keystone-trustflush.log',
   $user                             = $keystone::params::user,
 ) inherits keystone::params {
-
   include keystone::deps
 
   if $maxdelay == 0 {

manifests/db.pp

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

manifests/db/mysql.pp

@@ -42,7 +42,6 @@ class keystone::db::mysql(
   $collate       = 'utf8_general_ci',
   $allowed_hosts = undef
 ) {
-
   include keystone::deps
 
   openstacklib::db::mysql { 'keystone':

manifests/db/postgresql.pp

@@ -41,7 +41,6 @@ class keystone::db::postgresql(
   $encoding   = undef,
   $privileges = 'ALL',
 ) {
-
   include keystone::deps
 
   openstacklib::db::postgresql { 'keystone':

manifests/db/sync.pp

@@ -23,7 +23,6 @@ class keystone::db::sync(
   $keystone_user   = $keystone::params::user,
   $db_sync_timeout = 300,
 ) inherits keystone::params {
-
   include keystone::deps
 
   exec { 'keystone-manage db_sync':

manifests/federation.pp

@@ -18,7 +18,6 @@ class keystone::federation (
   $trusted_dashboards  = $facts['os_service_default'],
   $remote_id_attribute = $facts['os_service_default'],
 ) {
-
   include keystone::deps
 
   keystone_config {

manifests/federation/identity_provider.pp

@@ -96,7 +96,6 @@ class keystone::federation::identity_provider(
   $idp_contact_type              = $facts['os_service_default'],
   $package_ensure                = present,
 ) inherits keystone::params {
-
   include keystone::deps
 
   if $keystone::service_name != 'httpd' {
@@ -148,5 +147,4 @@ class keystone::federation::identity_provider(
     mode   => '0600',
     owner  => $user,
   }
-
 }

manifests/federation/mellon.pp

@@ -38,7 +38,6 @@ class keystone::federation::mellon (
   $template_order        = 331,
   Boolean $enable_websso = false,
 ) {
-
   include apache
   include apache::mod::auth_mellon
   include keystone::deps
@@ -66,7 +65,7 @@ Apache + Mellon SP setups, where a REMOTE_USER env variable is always set, even
     'auth/methods': value => join(any2array($methods),',');
   }
 
-  if($enable_websso){
+  if $enable_websso {
     keystone_config {
       'mapped/remote_id_attribute': value => 'MELLON_IDP';
     }

manifests/federation/shibboleth.pp

@@ -49,7 +49,6 @@ class keystone::federation::shibboleth (
   $template_order           = 331,
   $yum_repo_name            = 'shibboleth',
 ) {
-
   include apache
   include keystone::deps
 

manifests/healthcheck.pp

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

manifests/init.pp

@@ -469,7 +469,6 @@ class keystone(
   # DEPRECATED PARAMETERS
   $rabbit_heartbeat_in_pthread                    = undef,
 ) inherits keystone::params {
-
   include keystone::deps
   include keystone::logging
   include keystone::policy

manifests/ldap.pp

@@ -292,7 +292,6 @@ class keystone::ldap(
   $package_ensure                       = present,
   Boolean $manage_packages              = true,
 ) inherits keystone::params {
-
   include keystone::deps
 
   if $manage_packages {

manifests/ldap_backend.pp

@@ -303,7 +303,6 @@ define keystone::ldap_backend(
   Boolean $manage_packages              = true,
   Boolean $create_domain_entry          = false,
 ) {
-
   include keystone::deps
   include keystone::params
 

manifests/logging.pp

@@ -128,7 +128,6 @@ class keystone::logging(
   $instance_uuid_format          = $facts['os_service_default'],
   $log_date_format               = $facts['os_service_default'],
 ) {
-
   include keystone::deps
 
   oslo::log { 'keystone_config':

manifests/policy.pp

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

manifests/resource/authtoken.pp

@@ -268,8 +268,6 @@ define keystone::resource::authtoken(
   $service_type                    = $facts['os_service_default'],
   $interface                       = $facts['os_service_default'],
 ) {
-
-  include keystone::deps
   include keystone::params
 
   if !is_service_default($memcache_security_strategy) {

manifests/resource/service_identity.pp

@@ -133,7 +133,6 @@ define keystone::resource::service_identity(
   Optional[String[1]] $user_domain                  = $default_domain,
   Optional[String[1]] $project_domain               = $default_domain,
 ) {
-
   include keystone::deps
 
   $user_domain_real = $user_domain ? {
@@ -169,11 +168,9 @@ define keystone::resource::service_identity(
       'email'    => $email,
       'domain'   => $user_domain_real,
     })
-
   }
 
   if $configure_user_role {
-
     if $ensure == 'present' {
       # NOTE(jaosorior): We only handle ensure 'present' here, since deleting a
       # role might be conflicting in some cases. e.g. the deployer removing a

manifests/resource/service_user.pp

@@ -90,10 +90,6 @@ define keystone::resource::service_user(
   $keyfile                 = $facts['os_service_default'],
   $region_name             = $facts['os_service_default'],
 ) {
-
-  include keystone::params
-  include keystone::deps
-
   if is_service_default($system_scope) {
     $project_name_real        = $project_name
     $project_domain_name_real = $project_domain_name

manifests/security_compliance.pp

@@ -89,7 +89,6 @@ class keystone::security_compliance(
   $invalid_password_hash_function     = $facts['os_service_default'],
   $invalid_password_hash_max_chars    = $facts['os_service_default'],
 ) {
-
   include keystone::deps
 
   keystone_config {

manifests/wsgi/apache.pp

@@ -180,7 +180,6 @@ class keystone::wsgi::apache (
   $vhost_custom_fragment             = undef,
   $custom_wsgi_process_options       = {},
 ) {
-
   include keystone::deps
   include keystone::params
 

manifests/wsgi/uwsgi.pp

@@ -26,7 +26,6 @@ class keystone::wsgi::uwsgi (
   $threads           = 32,
   $listen_queue_size = 100,
 ) {
-
   include keystone::deps
 
   if $facts['os']['name'] != 'Debian' {