Prepare for voxpupuli-puppet-lint-plugins

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

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

examples/magnum.pp

@@ -57,4 +57,3 @@
   class { 'magnum::certificates':
     cert_manager_type => 'local',
   }
-

manifests/api.pp

@@ -85,7 +85,6 @@ class magnum::api(
   $workers                      = $facts['os_workers'],
   $enable_proxy_headers_parsing = $facts['os_service_default'],
 ) inherits magnum::params {
-
   include magnum::deps
   include magnum::params
   include magnum::policy
@@ -144,7 +143,6 @@ class magnum::api(
 
       # On any uwsgi config change, we must restart Magnum API.
       Magnum_api_uwsgi_config<||> ~> Service['magnum-api']
-
     } elsif $service_name == 'httpd' {
       service { 'magnum-api':
         ensure    => 'stopped',
@@ -168,5 +166,4 @@ class magnum::api(
   oslo::middleware { 'magnum_config':
     enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
   }
-
 }

manifests/capi_helm.pp

@@ -123,7 +123,6 @@ class magnum::capi_helm (
   String[1] $csi_cinder_availability_zone                                          = $facts['os_service_default'],
   String[1] $app_cred_interface_type                                               = $facts['os_service_default'],
 ) inherits magnum::params {
-
   include magnum::deps
 
   magnum_config {
@@ -155,4 +154,3 @@ class magnum::capi_helm (
     }
   }
 }
-

manifests/certificates.pp

@@ -16,13 +16,10 @@ class magnum::certificates (
   $cert_manager_type = $facts['os_service_default'],
   $storage_path      = $facts['os_service_default'],
 ) {
-
   include magnum::deps
 
   magnum_config {
     'certificates/cert_manager_type': value => $cert_manager_type;
     'certificates/storage_path':      value => $storage_path;
   }
-
 }
-

manifests/cinder.pp

@@ -26,7 +26,6 @@ class magnum::cinder (
   $default_boot_volume_type   = $facts['os_service_default'],
   $default_boot_volume_size   = $facts['os_service_default'],
 ) {
-
   include magnum::deps
 
   magnum_config {
@@ -35,6 +34,4 @@ class magnum::cinder (
     'cinder/default_boot_volume_type':   value => $default_boot_volume_type;
     'cinder/default_boot_volume_size':   value => $default_boot_volume_size;
   }
-
 }
-

manifests/client.pp

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

manifests/clients/barbican.pp

@@ -18,7 +18,6 @@ class magnum::clients::barbican(
   $region_name   = $magnum::clients::region_name,
   $endpoint_type = $magnum::clients::endpoint_type,
 ) inherits magnum::clients {
-
   include magnum::deps
   include magnum::params
 

manifests/clients/cinder.pp

@@ -43,7 +43,6 @@ class magnum::clients::cinder(
   $key_file      = $magnum::clients::key_file,
   $insecure      = $magnum::clients::insecure
 ) inherits magnum::clients {
-
   include magnum::deps
   include magnum::params
 

manifests/clients/glance.pp

@@ -34,7 +34,6 @@
 #   (optional) If set, then the server's certificate will not be verified.
 #   Defaults to false
 #
-
 class magnum::clients::glance (
   $region_name   = $magnum::clients::region_name,
   $endpoint_type = $magnum::clients::endpoint_type,
@@ -44,7 +43,6 @@ class magnum::clients::glance(
   $key_file      = $magnum::clients::key_file,
   $insecure      = $magnum::clients::insecure
 ) inherits magnum::clients {
-
   include magnum::deps
   include magnum::params
 

manifests/clients/heat.pp

@@ -34,7 +34,6 @@
 #   (optional) If set, then the server's certificate will not be verified.
 #   Defaults to false
 #
-
 class magnum::clients::heat (
   $region_name   = $magnum::clients::region_name,
   $endpoint_type = $magnum::clients::endpoint_type,
@@ -44,7 +43,6 @@ class magnum::clients::heat(
   $key_file      = $magnum::clients::key_file,
   $insecure      = $magnum::clients::insecure
 ) inherits magnum::clients {
-
   include magnum::deps
   include magnum::params
 

manifests/clients/magnum.pp

@@ -13,12 +13,11 @@
 #   (optional) Type of endpoint in Identity service catalog to use for
 #   communication with the OpenStack service.
 #   Defaults to publicURL
-
+#
 class magnum::clients::magnum (
   $region_name   = $magnum::clients::region_name,
   $endpoint_type = $magnum::clients::endpoint_type,
 ) inherits magnum::clients {
-
   include magnum::deps
   include magnum::params
 

manifests/clients/neutron.pp

@@ -38,7 +38,6 @@ class magnum::clients::neutron(
   $key_file      = $magnum::clients::key_file,
   $insecure      = $magnum::clients::insecure
 ) inherits magnum::clients {
-
   include magnum::deps
   include magnum::params
 

manifests/clients/nova.pp

@@ -34,7 +34,7 @@
 #   (optional) If set, then the server's certificate will not be verified.
 #   Defaults to false
 #
-
+#
 class magnum::clients::nova (
   $region_name   = $magnum::clients::region_name,
   $endpoint_type = $magnum::clients::endpoint_type,
@@ -44,7 +44,6 @@ class magnum::clients::nova(
   $key_file      = $magnum::clients::key_file,
   $insecure      = $magnum::clients::insecure
 ) inherits magnum::clients {
-
   include magnum::deps
   include magnum::params
 

manifests/clients/octavia.pp

@@ -38,7 +38,6 @@ class magnum::clients::octavia(
   $key_file      = $magnum::clients::key_file,
   $insecure      = $magnum::clients::insecure,
 ) inherits magnum::clients {
-
   include magnum::deps
   include magnum::params
 

manifests/cluster.pp

@@ -28,7 +28,6 @@ class magnum::cluster (
   $temp_cache_dir                         = $facts['os_service_default'],
   $pre_delete_lb_timeout                  = $facts['os_service_default'],
 ) {
-
   include magnum::deps
 
   magnum_config {

manifests/cluster_template.pp

@@ -16,7 +16,6 @@ class magnum::cluster_template (
   $kubernetes_allowed_network_drivers = $facts['os_service_default'],
   $kubernetes_default_network_driver  = $facts['os_service_default'],
 ) {
-
   include magnum::deps
 
   magnum_config {

manifests/conductor.pp

@@ -31,7 +31,6 @@ class magnum::conductor(
   $auth_strategy                = 'keystone',
   $workers                      = $facts['os_workers'],
 ) {
-
   include magnum::db
   include magnum::deps
   include magnum::params

manifests/config.pp

@@ -27,7 +27,6 @@ class magnum::config (
   Hash $magnum_config        = {},
   Hash $magnum_api_paste_ini = {},
 ) {
-
   include magnum::deps
 
   create_resources('magnum_config', $magnum_config)

manifests/db.pp

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

manifests/db/mysql.pp

@@ -42,7 +42,6 @@ class magnum::db::mysql(
   $collate       = 'utf8_general_ci',
   $allowed_hosts = undef
 ) {
-
   include magnum::deps
 
   openstacklib::db::mysql { 'magnum':
@@ -58,5 +57,4 @@ class magnum::db::mysql(
   Anchor['magnum::db::begin']
   ~> Class['magnum::db::mysql']
   ~> Anchor['magnum::db::end']
-
 }

manifests/db/postgresql.pp

@@ -31,7 +31,6 @@ class magnum::db::postgresql(
   $encoding   = undef,
   $privileges = 'ALL',
 ) {
-
   include magnum::deps
 
   openstacklib::db::postgresql { 'magnum':
@@ -45,5 +44,4 @@ class magnum::db::postgresql(
   Anchor['magnum::db::begin']
   ~> Class['magnum::db::postgresql']
   ~> Anchor['magnum::db::end']
-
 }

manifests/db/sync.pp

@@ -21,7 +21,6 @@ class magnum::db::sync(
   $extra_params    = '',
   $db_sync_timeout = 300,
 ) {
-
   include magnum::deps
   include magnum::params
 
@@ -42,5 +41,4 @@ class magnum::db::sync(
     notify      => Anchor['magnum::dbsync::end'],
     tag         => 'openstack-db',
   }
-
 }

manifests/docker_registry.pp

@@ -17,6 +17,7 @@ class magnum::docker_registry (
   $swift_region             = $facts['os_service_default'],
   $swift_registry_container = $facts['os_service_default'],
 ) {
+  include magnum::deps
 
   magnum_config {
     'docker_registry/swift_region':             value => $swift_region;

manifests/drivers.pp

@@ -28,7 +28,6 @@ class magnum::drivers (
   Variant[Array, Openstacklib::ServiceDefault]                $disabled_drivers      = $facts['os_service_default'],
   Variant[Array, Openstacklib::ServiceDefault]                $enabled_beta_drivers  = $facts['os_service_default'],
 ) {
-
   include magnum::deps
 
   magnum_config {

manifests/healthcheck.pp

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

manifests/init.pp

@@ -210,7 +210,6 @@ class magnum(
   # DEPRECATED PARAMETERS
   $rabbit_heartbeat_in_pthread        = undef,
 ) {
-
   include magnum::deps
   include magnum::params
   include magnum::policy
@@ -265,5 +264,4 @@ class magnum(
     topics        => $notification_topics,
     retry         => $notification_retry,
   }
-
 }

manifests/keystone/auth.pp

@@ -97,7 +97,6 @@ class magnum::keystone::auth (
   Keystone::EndpointUrl $admin_url        = 'http://127.0.0.1:9511/v1',
   Keystone::EndpointUrl $internal_url     = 'http://127.0.0.1:9511/v1',
 ) {
-
   include magnum::deps
 
   $real_service_name = pick($service_name, $auth_name)
@@ -124,5 +123,4 @@ class magnum::keystone::auth (
     internal_url        => $internal_url,
     admin_url           => $admin_url,
   }
-
 }

manifests/keystone/authtoken.pp

@@ -228,7 +228,6 @@ class magnum::keystone::authtoken(
   $service_type                   = $facts['os_service_default'],
   $interface                      = $facts['os_service_default'],
 ) {
-
   include magnum::deps
 
   keystone::resource::authtoken { 'magnum_config':

manifests/keystone/domain.pp

@@ -88,7 +88,6 @@ class magnum::keystone::domain (
   $domain_admin_id          = undef,
   $domain_admin_domain_id   = undef,
 ) {
-
   include magnum::deps
   include magnum::params
 
@@ -142,5 +141,4 @@ class magnum::keystone::domain (
     'trust/trustee_keystone_interface':        value => $keystone_interface;
     'trust/trustee_keystone_region_name':      value => $keystone_region_name;
   }
-
 }

manifests/keystone/keystone_auth.pp

@@ -67,7 +67,6 @@ class magnum::keystone::keystone_auth(
   $certfile            = $facts['os_service_default'],
   $insecure            = $facts['os_service_default'],
 ) {
-
   include magnum::deps
 
   if is_service_default($system_scope) {

manifests/logging.pp

@@ -122,7 +122,6 @@ class magnum::logging(
   $instance_uuid_format          = $facts['os_service_default'],
   $log_date_format               = $facts['os_service_default'],
 ) {
-
   include magnum::deps
 
   oslo::log { 'magnum_config':
@@ -146,5 +145,4 @@ class magnum::logging(
     instance_format               => $instance_format,
     instance_uuid_format          => $instance_uuid_format,
   }
-
 }

manifests/params.pp

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

manifests/policy.pp

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

manifests/quota.pp

@@ -11,6 +11,7 @@
 class magnum::quota (
   $max_clusters_per_project = $facts['os_service_default']
 ) {
+  include magnum::deps
 
   magnum_config {
     'quotas/max_clusters_per_project': value => $max_clusters_per_project;

manifests/reports.pp

@@ -22,7 +22,6 @@ class magnum::reports(
   $file_event_handler          = $facts['os_service_default'],
   $file_event_handler_interval = $facts['os_service_default'],
 ) {
-
   include magnum::deps
 
   oslo::reports { 'magnum_config':

manifests/wsgi/apache.pp

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

manifests/wsgi/uwsgi.pp

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

manifests/x509.pp

@@ -31,7 +31,6 @@ class magnum::x509 (
   $term_of_validity   = $facts['os_service_default'],
   $rsa_key_size       = $facts['os_service_default'],
 ) {
-
   include magnum::deps
 
   magnum_config {
@@ -41,6 +40,4 @@ class magnum::x509 (
     'x509/term_of_validity':   value => $term_of_validity;
     'x509/rsa_key_size':       value => $rsa_key_size;
   }
-
 }
-