Prepare for voxpupuli-puppet-lint-plugins

Fix new lint errors detected when full of the voxpupili lint plugins are enabled. Change-Id: Ifb5b50d7ae23c3e69a70721598e2719dbafa14d5 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
2025-08-20 10:37:13 +09:00
parent fe82252e68
commit 73d0dbfb0a
90 changed files with 227 additions and 338 deletions
--- a/examples/all.pp
+++ b/examples/all.pp
@@ -10,7 +10,6 @@ Exec { logoutput => true }

 package { 'curl': ensure => present }

-
 class { 'memcached':
  listen_ip => $swift_local_net_ip,
 }
@@ -51,7 +50,6 @@ class { 'swift::ringbuilder':
  require        => Class['swift'],
 }

-
 # TODO should I enable swath in the default config?
 class { 'swift::proxy':
  proxy_local_net_ip => $swift_local_net_ip,
@@ -59,6 +57,7 @@ class { 'swift::proxy':
  account_autocreate => true,
  require            => Class['swift::ringbuilder'],
 }
+
 class {['swift::proxy::healthcheck', 'swift::proxy::cache']: }

 class { 'swift::proxy::tempauth':
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -21,7 +21,6 @@
 # this site manifest serves as an example of how to
 # deploy various swift environments

-
 #$swift_admin_password = 'admin_password'
 $swift_admin_password = hiera('admin_password', 'admin_password')

@@ -29,7 +28,6 @@ $swift_admin_password = hiera('admin_password', 'admin_password')
 #$swift_shared_secret = 'changeme'
 $swift_shared_secret = hiera('swift_shared_secret', 'changeme')

-
 #$swift_local_net_ip   = $ipaddress_eth0
 $swift_local_net_ip = hiera('swift_local_net_ip', $ipaddress_eth0)

@@ -67,7 +65,6 @@ $swift_keystone_admin_password = hiera('admin_password', 'ChangeMe')
 # This service only contains the credentials for authenticating
 # swift
 node 'swift-keystone' {
-
  # set up mysql server
  class { 'mysql::server':
    config_hash => {
@@ -108,7 +105,6 @@ node 'swift-keystone' {
    password       => $swift_admin_password,
    public_address => $swift_proxy_node,
  }
-
 }

 #
@@ -120,7 +116,6 @@ node 'swift-keystone' {
 # partitions
 #
 node /swift-storage/ {
-
  class { 'swift':
    # not sure how I want to deal with this shared secret
    swift_hash_path_suffix => $swift_shared_secret,
@@ -179,12 +174,9 @@ node /swift-storage/ {

  # collect resources for synchronizing the ring databases
  Swift::Ringsync<<||>>
-
 }

-
 node /swift-proxy/ {
-
  class { 'swift':
    # not sure how I want to deal with this shared secret
    swift_hash_path_suffix => $swift_shared_secret,
--- a/manifests/auth_file.pp
+++ b/manifests/auth_file.pp
@@ -24,7 +24,6 @@ class swift::auth_file (
  $admin_user      = 'admin',
  $auth_url        = 'http://127.0.0.1:5000/v3/'
 ) {
-
  include swift::deps

  file { '/root/swiftrc':
@@ -33,11 +32,9 @@ class swift::auth_file (
    group   => 'root',
    mode    => '0600',
    tag     => 'swift-file',
-    content =>
-  "
+    content => "
 export ST_USER=${admin_tenant}:${admin_user}
 export ST_KEY=${admin_password}
-  export ST_AUTH=${auth_url}
-  ",
+export ST_AUTH=${auth_url}",
  }
 }
--- a/manifests/bench.pp
+++ b/manifests/bench.pp
@@ -83,7 +83,6 @@ class swift::bench (
  $num_containers    = '20',
  $delete            = 'yes',
 ) {
-
  include swift::deps

  swift_bench_config {
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -11,7 +11,6 @@
 class swift::client (
  $ensure = 'present',
 ) {
-
  include swift::deps
  include swift::params

@@ -20,5 +19,4 @@ class swift::client (
    name   => $swift::params::client_package,
    tag    => 'openstack',
  }
-
 }
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -54,7 +54,6 @@ class swift::config (
  Hash $swift_object_config                = {},
  Hash $swift_internal_client_config       = {},
 ) {
-
  include swift::deps

  create_resources('swift_config', $swift_config)
--- a/manifests/constraints.pp
+++ b/manifests/constraints.pp
@@ -98,7 +98,6 @@ class swift::constraints(
  $valid_api_versions         = $facts['os_service_default'],
  $auto_create_account_prefix = $facts['os_service_default'],
 ) {
-
  include swift::deps
  include swift::params

--- a/manifests/containerreconciler.pp
+++ b/manifests/containerreconciler.pp
@@ -136,7 +136,6 @@ class swift::containerreconciler(
  $log_max_line_length                     = $facts['os_service_default'],
  Boolean $purge_config                    = false,
 ) inherits swift::params {
-
  include swift::deps
  Swift_container_reconciler_config<||> ~> Service['swift-container-reconciler']

@@ -160,7 +159,6 @@ class swift::containerreconciler(

  # only add memcache servers if 'cache' is included in the pipeline
  if !empty(grep(any2array($pipeline), 'cache')) {
-
    swift_container_reconciler_config {
      'filter:cache/memcache_servers': value => join(any2array($memcache_servers), ',');
      'filter:cache/tls_enabled':      value => $cache_tls_enabled;
@@ -220,5 +218,4 @@ class swift::containerreconciler(
    config_file_name       => 'container-reconciler.conf',
    service_provider       => $service_provider,
  }
-
 }
--- a/manifests/deps.pp
+++ b/manifests/deps.pp
@@ -71,5 +71,4 @@ class swift::deps {
  # Installation or config changes will always restart services.
  Anchor['swift::install::end'] ~> Anchor['swift::service::begin']
  Anchor['swift::config::end']  ~> Anchor['swift::service::begin']
-
 }
--- a/manifests/dispersion.pp
+++ b/manifests/dispersion.pp
@@ -79,7 +79,6 @@ class swift::dispersion (
  $concurrency   = 25,
  $dump_json     = 'no'
 ) {
-
  include swift::deps
  include swift::params

@@ -115,5 +114,4 @@ class swift::dispersion (
    # lint:endignore
    require   => Package['swiftclient'],
  }
-
 }
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -50,7 +50,6 @@ class swift(
  $package_ensure         = 'present',
  Boolean $purge_config   = false,
 ) {
-
  include swift::deps
  include swift::params
  include swift::client
--- a/manifests/internal_client.pp
+++ b/manifests/internal_client.pp
@@ -85,7 +85,6 @@ class swift::internal_client (
  $recoverable_node_timeout                      = $facts['os_service_default'],
  Boolean $purge_config                          = false,
 ) inherits swift::params {
-
  include swift::deps
  include swift::params

--- a/manifests/internal_client/cache.pp
+++ b/manifests/internal_client/cache.pp
@@ -55,7 +55,6 @@ class swift::internal_client::cache(
  $tls_keyfile              = $facts['os_service_default'],
  $memcache_max_connections = '2'
 ) {
-
  include swift::deps

  # require the memcached class if its on the same machine
@@ -72,5 +71,4 @@ class swift::internal_client::cache(
    'filter:cache/tls_keyfile':              value => $tls_keyfile;
    'filter:cache/memcache_max_connections': value => $memcache_max_connections;
  }
-
 }
--- a/manifests/internal_client/catch_errors.pp
+++ b/manifests/internal_client/catch_errors.pp
@@ -15,8 +15,7 @@
 #
 # Copyright 2012 eNovance licensing@enovance.com
 #
-class swift::internal_client::catch_errors() {
-
+class swift::internal_client::catch_errors {
  include swift::deps

  swift_internal_client_config {
--- a/manifests/internal_client/proxy_logging.pp
+++ b/manifests/internal_client/proxy_logging.pp
@@ -6,7 +6,6 @@
 #   Joe Topjian joe@topjian.net
 #
 class swift::internal_client::proxy_logging {
-
  include swift::deps

  swift_internal_client_config {
--- a/manifests/internal_client/symlink.pp
+++ b/manifests/internal_client/symlink.pp
@@ -32,7 +32,6 @@
 class swift::internal_client::symlink (
  $symloop_max = $facts['os_service_default'],
 ) {
-
  include swift::deps

  swift_internal_client_config {
--- a/manifests/keymaster.pp
+++ b/manifests/keymaster.pp
@@ -90,7 +90,6 @@ class swift::keymaster(
  $user_domain_id        = 'default',
  $meta_version_to_write = $facts['os_service_default'],
 ) {
-
  include swift::deps
  include swift::params

@@ -120,4 +119,3 @@ class swift::keymaster(
    'kms_keymaster/meta_version_to_write': value => $meta_version_to_write;
  }
 }
-
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -134,7 +134,6 @@ class swift::keystone::auth(
  Keystone::EndpointUrl $admin_url_s3        = 'http://127.0.0.1:8080',
  Keystone::EndpointUrl $internal_url_s3     = 'http://127.0.0.1:8080',
 ) {
-
  include swift::deps

  if $service_name == $service_name_s3 {
--- a/manifests/keystone/dispersion.pp
+++ b/manifests/keystone/dispersion.pp
@@ -35,7 +35,6 @@ class swift::keystone::dispersion(
  $email     = 'swift@localhost',
  $tenant    = 'services'
 ) {
-
  include swift::deps

  keystone_user { $auth_user:
@@ -51,5 +50,4 @@ class swift::keystone::dispersion(

  Keystone_user<| title == $auth_user |>
  ~> Keystone_user_role<| title == "${auth_user}@${tenant}" |>
-
 }
--- a/manifests/memcache.pp
+++ b/manifests/memcache.pp
@@ -76,7 +76,6 @@ class swift::memcache (
  $io_timeout                     = $facts['os_service_default'],
  Boolean $purge_config           = false,
 ) {
-
  include swift::deps
  include swift::params

--- a/manifests/objectexpirer.pp
+++ b/manifests/objectexpirer.pp
@@ -158,7 +158,6 @@ class swift::objectexpirer(
  # DEPRECATED PARAMETERS
  $expiring_objects_account_name           = undef,
 ) inherits swift::params {
-
  include swift::deps
  Swift_object_expirer_config<||> ~> Service['swift-object-expirer']

@@ -196,7 +195,6 @@ class swift::objectexpirer(

  # only add memcache servers if 'cache' is included in the pipeline
  if !empty(grep(any2array($pipeline), 'cache')) {
-
    swift_object_expirer_config {
      'filter:cache/memcache_servers': value => join(any2array($memcache_servers), ',');
      'filter:cache/tls_enabled':      value => $cache_tls_enabled;
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -72,6 +72,7 @@ class swift::params {
      fail("Unsupported osfamily: ${facts['os']['family']}")
    }
  }
+
  $swift_init_service_names = [
    'swift-proxy-server',
    'swift-object-auditor',
--- a/manifests/proxy.pp
+++ b/manifests/proxy.pp
@@ -253,12 +253,11 @@ class swift::proxy(
  Swift::ServiceProvider $service_provider       = $swift::params::service_provider,
  Boolean $purge_config                          = false,
 ) inherits swift::params {
-
  include swift::deps

-  if(member($pipeline, 'tempauth')) {
+  if member($pipeline, 'tempauth') {
    $auth_type = 'tempauth'
-  } elsif(member($pipeline, 'keystone')) {
+  } elsif member($pipeline, 'keystone') {
    $auth_type = 'keystone'
  } else {
    warning('no auth type provided in the pipeline')
@@ -269,7 +268,7 @@ class swift::proxy(
    fail('proxy-server must be the last element in pipeline')
  }

-  if($auth_type == 'tempauth' and ! $account_autocreate ){
+  if $auth_type == 'tempauth' and !$account_autocreate {
    fail('account_autocreate must be set to true when auth_type is tempauth')
  }

--- a/manifests/proxy/account_quotas.pp
+++ b/manifests/proxy/account_quotas.pp
@@ -17,8 +17,7 @@
 #
 # Configure Swift Account Quotas
 #
-class swift::proxy::account_quotas() {
-
+class swift::proxy::account_quotas {
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/audit.pp
+++ b/manifests/proxy/audit.pp
@@ -21,7 +21,6 @@ class swift::proxy::audit (
  $filter_factory = 'keystonemiddleware.audit:filter_factory',
  $audit_map_file = '/etc/pycadf/swift_api_audit_map.conf',
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/authtoken.pp
+++ b/manifests/proxy/authtoken.pp
@@ -111,7 +111,6 @@ class swift::proxy::authtoken(
  $service_type                 = $facts['os_service_default'],
  $interface                    = $facts['os_service_default'],
 ) inherits swift::params {
-
  include swift::deps

  if is_service_default($system_scope) {
--- a/manifests/proxy/bulk.pp
+++ b/manifests/proxy/bulk.pp
@@ -61,7 +61,6 @@ class swift::proxy::bulk(
  $delete_concurrency            = $facts['os_service_default'],
  $yield_frequency               = $facts['os_service_default'],
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/cache.pp
+++ b/manifests/proxy/cache.pp
@@ -55,7 +55,6 @@ class swift::proxy::cache(
  $tls_keyfile              = $facts['os_service_default'],
  $memcache_max_connections = '2'
 ) {
-
  include swift::deps

  # require the memcached class if its on the same machine
@@ -72,5 +71,4 @@ class swift::proxy::cache(
    'filter:cache/tls_keyfile':              value => $tls_keyfile;
    'filter:cache/memcache_max_connections': value => $memcache_max_connections;
  }
-
 }
--- a/manifests/proxy/catch_errors.pp
+++ b/manifests/proxy/catch_errors.pp
@@ -15,8 +15,7 @@
 #
 # Copyright 2012 eNovance licensing@enovance.com
 #
-class swift::proxy::catch_errors() {
-
+class swift::proxy::catch_errors {
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/ceilometer.pp
+++ b/manifests/proxy/ceilometer.pp
@@ -221,7 +221,6 @@ class swift::proxy::ceilometer(
  # DEPRECATED PARAMETERS
  $rabbit_heartbeat_in_pthread        = undef,
 ) inherits swift {
-
  include swift::deps
  include swift::params

@@ -297,5 +296,4 @@ class swift::proxy::ceilometer(
    name   => $swift::params::ceilometermiddleware_package_name,
    tag    => ['openstack', 'swift-support-package'],
  }
-
 }
--- a/manifests/proxy/cname_lookup.pp
+++ b/manifests/proxy/cname_lookup.pp
@@ -52,7 +52,6 @@ class swift::proxy::cname_lookup(
  $lookup_depth   = $facts['os_service_default'],
  $nameservers    = $facts['os_service_default'],
 ) {
-
  include swift::deps
  include swift::params

--- a/manifests/proxy/container_quotas.pp
+++ b/manifests/proxy/container_quotas.pp
@@ -17,8 +17,7 @@
 #
 # Configure Swift Container Quotas
 #
-class swift::proxy::container_quotas() {
-
+class swift::proxy::container_quotas {
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/container_sync.pp
+++ b/manifests/proxy/container_sync.pp
@@ -21,7 +21,6 @@ class swift::proxy::container_sync(
  $allow_full_urls = $facts['os_service_default'],
  $current         = $facts['os_service_default'],
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/copy.pp
+++ b/manifests/proxy/copy.pp
@@ -18,7 +18,6 @@
 class swift::proxy::copy (
  $object_post_as_copy = true
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/crossdomain.pp
+++ b/manifests/proxy/crossdomain.pp
@@ -14,7 +14,6 @@
 class swift::proxy::crossdomain (
  $cross_domain_policy = '<allow-access-from domain="*" secure="false" />',
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/dlo.pp
+++ b/manifests/proxy/dlo.pp
@@ -34,7 +34,6 @@ class swift::proxy::dlo (
  $rate_limit_segments_per_sec = $facts['os_service_default'],
  $max_get_time                = $facts['os_service_default'],
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/domain_remap.pp
+++ b/manifests/proxy/domain_remap.pp
@@ -79,7 +79,6 @@ class swift::proxy::domain_remap(
  $default_reseller_prefix = $facts['os_service_default'],
  $mangle_client_paths     = $facts['os_service_default'],
 ) {
-
  include swift::deps

  $reseller_prefixes_real = join(any2array($reseller_prefixes), ',')
--- a/manifests/proxy/encryption.pp
+++ b/manifests/proxy/encryption.pp
@@ -16,7 +16,6 @@
 class swift::proxy::encryption (
  $disable_encryption = false
 ) {
-
  include swift::deps

  swift_proxy_config {
@@ -24,4 +23,3 @@ class swift::proxy::encryption (
    'filter:encryption/disable_encryption': value => $disable_encryption;
  }
 }
-
--- a/manifests/proxy/etag_quoter.pp
+++ b/manifests/proxy/etag_quoter.pp
@@ -24,7 +24,6 @@
 class swift::proxy::etag_quoter (
  $enabled_by_default      = $facts['os_service_default']
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/formpost.pp
+++ b/manifests/proxy/formpost.pp
@@ -24,7 +24,6 @@
 class swift::proxy::formpost (
  $allowed_digests = $facts['os_service_default'],
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/gatekeeper.pp
+++ b/manifests/proxy/gatekeeper.pp
@@ -54,7 +54,6 @@ class swift::proxy::gatekeeper(
  $log_headers                 = $facts['os_service_default'],
  $log_address                 = '/dev/log'
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/healthcheck.pp
+++ b/manifests/proxy/healthcheck.pp
@@ -13,8 +13,7 @@
 #
 # Copyright 2011 Puppetlabs Inc, unless otherwise noted.
 #
-class swift::proxy::healthcheck() {
-
+class swift::proxy::healthcheck {
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/keymaster.pp
+++ b/manifests/proxy/keymaster.pp
@@ -13,12 +13,10 @@
 class swift::proxy::keymaster (
  $encryption_root_secret,
 ) {
-
  include swift::deps

  swift_proxy_config {
    'filter:keymaster/use':                    value => 'egg:swift#keymaster';
    'filter:keymaster/encryption_root_secret': value => $encryption_root_secret, secret => true;
  }
-
 }
--- a/manifests/proxy/keystone.pp
+++ b/manifests/proxy/keystone.pp
@@ -44,7 +44,6 @@ class swift::proxy::keystone(
  $project_reader_roles = $facts['os_service_default'],
  $system_reader_roles  = $facts['os_service_default'],
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/kms_keymaster.pp
+++ b/manifests/proxy/kms_keymaster.pp
@@ -13,7 +13,6 @@
 class swift::proxy::kms_keymaster (
  $keymaster_config_path = '/etc/swift/keymaster.conf'
 ) {
-
  include swift::deps

  swift_proxy_config {
@@ -21,4 +20,3 @@ class swift::proxy::kms_keymaster (
    'filter:kms_keymaster/keymaster_config_path': value => $keymaster_config_path;
  }
 }
-
--- a/manifests/proxy/listing_formats.pp
+++ b/manifests/proxy/listing_formats.pp
@@ -17,7 +17,6 @@
 #
 class swift::proxy::listing_formats (
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/proxy_logging.pp
+++ b/manifests/proxy/proxy_logging.pp
@@ -6,7 +6,6 @@
 #   Joe Topjian joe@topjian.net
 #
 class swift::proxy::proxy_logging {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/ratelimit.pp
+++ b/manifests/proxy/ratelimit.pp
@@ -56,7 +56,6 @@ class swift::proxy::ratelimit(
  Hash $container_ratelimit         = {},
  Hash $container_listing_ratelimit = {},
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/read_only.pp
+++ b/manifests/proxy/read_only.pp
@@ -16,7 +16,6 @@ class swift::proxy::read_only(
  $read_only     = $facts['os_service_default'],
  $allow_deletes = $facts['os_service_default']
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/s3api.pp
+++ b/manifests/proxy/s3api.pp
@@ -90,7 +90,6 @@ class swift::proxy::s3api(
  $min_segment_size              = $facts['os_service_default'],
  $log_name                      = $facts['os_service_default'],
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/s3token.pp
+++ b/manifests/proxy/s3token.pp
@@ -96,7 +96,6 @@ class swift::proxy::s3token(
  $project_domain_id     = 'default',
  $system_scope          = $facts['os_service_default'],
 ) {
-
  include swift::deps

  if is_service_default($system_scope) {
--- a/manifests/proxy/slo.pp
+++ b/manifests/proxy/slo.pp
@@ -73,7 +73,6 @@ class swift::proxy::slo (
  $yield_frequency             = $facts['os_service_default'],
  $allow_async_delete          = $facts['os_service_default'],
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/staticweb.pp
+++ b/manifests/proxy/staticweb.pp
@@ -25,7 +25,6 @@
 class swift::proxy::staticweb (
  $url_base = $facts['os_service_default']
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/symlink.pp
+++ b/manifests/proxy/symlink.pp
@@ -32,7 +32,6 @@
 class swift::proxy::symlink (
  $symloop_max = $facts['os_service_default'],
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/tempauth.pp
+++ b/manifests/proxy/tempauth.pp
@@ -80,10 +80,9 @@ class swift::proxy::tempauth (
  Optional[Boolean] $allow_overrides                             = undef,
  Optional[Enum['http', 'https', 'default']] $storage_url_scheme = undef,
 ) {
-
  include swift::deps

-  if ($reseller_prefix) {
+  if $reseller_prefix {
    $reseller_prefix_upcase = upcase($reseller_prefix)
  } else {
    $reseller_prefix_upcase = $reseller_prefix
--- a/manifests/proxy/tempauth_account.pp
+++ b/manifests/proxy/tempauth_account.pp
@@ -11,8 +11,7 @@
 #
 #   Adam Vinsh <adam.vinsh@charter.com>
 #
-define swift::proxy::tempauth_account() {
-
+define swift::proxy::tempauth_account {
  include swift::deps

  # strip white space and split string into array elements around ','
--- a/manifests/proxy/tempurl.pp
+++ b/manifests/proxy/tempurl.pp
@@ -56,7 +56,6 @@ class swift::proxy::tempurl (
  $outgoing_allow_headers  = $facts['os_service_default'],
  $allowed_digests         = $facts['os_service_default'],
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/proxy/versioned_writes.pp
+++ b/manifests/proxy/versioned_writes.pp
@@ -14,7 +14,6 @@
 class swift::proxy::versioned_writes (
  $allow_versioned_writes = false
 ) {
-
  include swift::deps

  swift_proxy_config {
--- a/manifests/ringbuilder.pp
+++ b/manifests/ringbuilder.pp
@@ -29,7 +29,6 @@ class swift::ringbuilder(
  $replicas       = undef,
  $min_part_hours = undef
 ) {
-
  include swift::deps
  Class['swift'] -> Class['swift::ringbuilder']

@@ -46,5 +45,4 @@ class swift::ringbuilder(
  Swift::Ringbuilder::Create['account'] -> Ring_account_device <| |> ~> Swift::Ringbuilder::Rebalance['account']

  swift::ringbuilder::rebalance { ['object', 'account', 'container']: }
-
 }
--- a/manifests/ringbuilder/create.pp
+++ b/manifests/ringbuilder/create.pp
@@ -42,7 +42,6 @@ define swift::ringbuilder::create(
  $min_part_hours            = 24,
  $user                      = 'root'
 ) {
-
  include swift::deps

  exec { "create_${ring_type}":
@@ -52,5 +51,4 @@ define swift::ringbuilder::create(
    creates => "/etc/swift/${ring_type}.builder",
    before  => Anchor['swift::config::end'],
  }
-
 }
--- a/manifests/ringbuilder/policy_ring.pp
+++ b/manifests/ringbuilder/policy_ring.pp
@@ -43,7 +43,6 @@ define swift::ringbuilder::policy_ring(
  $replicas                   = undef,
  $min_part_hours             = undef,
 ) {
-
  include swift::deps
  Class['swift'] -> Swift::Ringbuilder::Policy_ring[$policy_id]

@@ -61,5 +60,4 @@ define swift::ringbuilder::policy_ring(
  swift::ringbuilder::rebalance { $ring_builder: }

  Swift::Ringbuilder::Create[$ring_builder] -> Ring_object_device <| |> ~> Swift::Ringbuilder::Rebalance[$ring_builder]
-
 }
--- a/manifests/ringbuilder/rebalance.pp
+++ b/manifests/ringbuilder/rebalance.pp
@@ -16,7 +16,6 @@ define swift::ringbuilder::rebalance(
  Swift::RingType $ring_type                            = $name,
  Optional[Variant[Integer[0], Pattern[/^\d+$/]]] $seed = undef
 ) {
-
  include swift::deps

  exec { "rebalance_${ring_type}":
--- a/manifests/ringserver.pp
+++ b/manifests/ringserver.pp
@@ -34,7 +34,6 @@ class swift::ringserver(
  $max_connections = 5,
  $rsync_use_xinetd = $swift::params::xinetd_available,
 ) inherits swift::params {
-
  include swift::deps
  Class['swift::ringbuilder'] -> Class['swift::ringserver']

--- a/manifests/ringsync.pp
+++ b/manifests/ringsync.pp
@@ -9,7 +9,6 @@ define swift::ringsync(
  String[1] $ring_server,
  Swift::RingType $ring_type = $name,
 ) {
-
  include swift::deps

  Exec { path => '/usr/bin' }
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -51,11 +51,10 @@ define swift::service(
  $service_require                         = undef,
  Optional[String[1]] $service_tag         = undef,
 ) {
-
  include swift::deps
  include swift::params

-  if(! member($swift::params::swift_init_service_names, $name)) {
+  if !member($swift::params::swift_init_service_names, $name) {
    fail("swift::service name: ${name} is not a valid swift_init_service_name")
  }

--- a/manifests/storage.pp
+++ b/manifests/storage.pp
@@ -28,7 +28,6 @@ class swift::storage(
  $storage_local_net_ip,
  $rsync_use_xinetd = $swift::params::xinetd_available,
 ) inherits swift::params {
-
  include swift::deps

  if $rsync_use_xinetd and ! $swift::params::xinetd_available {
--- a/manifests/storage/account.pp
+++ b/manifests/storage/account.pp
@@ -33,7 +33,6 @@ class swift::storage::account(
  String[1] $config_file_name              = 'account-server.conf',
  Swift::ServiceProvider $service_provider = $swift::params::service_provider
 ) inherits swift::params {
-
  include swift::deps

  swift::storage::generic { 'account':
--- a/manifests/storage/all.pp
+++ b/manifests/storage/all.pp
@@ -176,7 +176,6 @@ class swift::storage::all(
  $splice                         = false,
  $rsync_use_xinetd               = $swift::params::xinetd_available,
 ) inherits swift::params {
-
  include swift::deps

  if ("${$object_port}" == '6000') {
--- a/manifests/storage/container.pp
+++ b/manifests/storage/container.pp
@@ -39,7 +39,6 @@ class swift::storage::container(
  String[1] $config_file_name              = 'container-server.conf',
  Swift::ServiceProvider $service_provider = $swift::params::service_provider
 ) inherits swift::params {
-
  include swift::deps

  swift::storage::generic { 'container':
--- a/manifests/storage/cron/recon.pp
+++ b/manifests/storage/cron/recon.pp
@@ -53,7 +53,6 @@ class swift::storage::cron::recon(
  $configfile = '/etc/swift/object-server.conf',
  $user       = $swift::params::user
 ) inherits swift::params {
-
  include swift::deps

  cron { 'swift-recon-cron':
--- a/manifests/storage/disk.pp
+++ b/manifests/storage/disk.pp
@@ -84,7 +84,6 @@ define swift::storage::disk(
  Boolean $manage_filesystem                = true,
  String[1] $label                          = $name,
 ) {
-
  include swift::deps
  include swift::params

@@ -113,7 +112,8 @@ define swift::storage::disk(
    }
  }

-  create_resources("swift::storage::${filesystem_type}", { $name => {
+  create_resources("swift::storage::${filesystem_type}", {
+    $name => {
      'device'            => "${base_dir}/${name}",
      'mnt_base_dir'      => $mnt_base_dir,
      'byte_size'         => $byte_size,
@@ -121,6 +121,6 @@ define swift::storage::disk(
      'mount_type'        => $mount_type,
      'manage_filesystem' => $manage_filesystem,
      'label'             => $label,
-  }})
-
+    },
+  })
 }
--- a/manifests/storage/disks.pp
+++ b/manifests/storage/disks.pp
@@ -24,6 +24,9 @@
 # [*defaults*] A config hash
 #   Optional. Defaults to a empty hash
 #
-class swift::storage::disks($args = {}, $defaults = {}) {
+class swift::storage::disks (
+  $args     = {},
+  $defaults = {}
+) {
  create_resources(swift::storage::disk, $args, $defaults)
 }
--- a/manifests/storage/drive_audit.pp
+++ b/manifests/storage/drive_audit.pp
@@ -128,7 +128,6 @@ class swift::storage::drive_audit(
  Hash[String[1], String[1]] $regex_pattern = {},
  Boolean $purge_config                     = false,
 ) inherits swift::params {
-
  include swift::deps

  resources { 'swift_drive_audit_config':
@@ -145,7 +144,6 @@ class swift::storage::drive_audit(
  }
  File['/etc/swift/drive-audit.conf'] -> Swift_drive_audit_config<||>

-
  swift_drive_audit_config {
    'drive-audit/log_name'            : value => $log_name;
    'drive-audit/log_facility'        : value => $log_facility;
--- a/manifests/storage/ext4.pp
+++ b/manifests/storage/ext4.pp
@@ -43,7 +43,6 @@ define swift::storage::ext4(
  Boolean $manage_filesystem                = true,
  String[1] $label                          = $name,
 ) {
-
  include swift::deps

  case $mount_type {
--- a/manifests/storage/filter/backend_ratelimit.pp
+++ b/manifests/storage/filter/backend_ratelimit.pp
@@ -71,7 +71,6 @@ define swift::storage::filter::backend_ratelimit(
  $update_requests_per_device_per_second    = $facts['os_service_default'],
  $requests_per_device_rate_buffer          = $facts['os_service_default'],
 ) {
-
  include swift::deps

  $config_type = "swift_${name}_config"
@@ -108,5 +107,4 @@ define swift::storage::filter::backend_ratelimit(
      'value' => $requests_per_device_rate_buffer,
    }
  })
-
 }
--- a/manifests/storage/filter/healthcheck.pp
+++ b/manifests/storage/filter/healthcheck.pp
@@ -3,9 +3,7 @@
 #
 # Copyright 2011 Puppetlabs Inc, unless otherwise noted.
 #
-define swift::storage::filter::healthcheck(
-) {
-
+define swift::storage::filter::healthcheck {
  include swift::deps

  $config_type = "swift_${name}_config"
--- a/manifests/storage/filter/recon.pp
+++ b/manifests/storage/filter/recon.pp
@@ -22,7 +22,6 @@
 define swift::storage::filter::recon (
  $cache_path = $facts['os_service_default'],
 ) {
-
  include swift::deps

  $config_type = "swift_${name}_config"
@@ -31,5 +30,4 @@ define swift::storage::filter::recon(
    'filter:recon/use'              => { 'value' => 'egg:swift#recon' },
    'filter:recon/recon_cache_path' => { 'value' => $cache_path },
  })
-
 }
--- a/manifests/storage/generic.pp
+++ b/manifests/storage/generic.pp
@@ -41,7 +41,6 @@ define swift::storage::generic(
  String[1] $config_file_name              = "${name}-server.conf",
  Swift::ServiceProvider $service_provider = $swift::params::service_provider
 ) {
-
  include swift::deps
  include swift::params

--- a/manifests/storage/loopback.pp
+++ b/manifests/storage/loopback.pp
@@ -37,7 +37,6 @@ define swift::storage::loopback(
  $seek         = '25000',
  $fstype       = 'xfs'
 ) {
-
  include swift::deps
  include swift::params

--- a/manifests/storage/loopbacks.pp
+++ b/manifests/storage/loopbacks.pp
@@ -24,6 +24,9 @@
 # [*defaults*] A config hash
 #   Optional. Defaults to a empty hash
 #
-class swift::storage::loopbacks($args = {}, $defaults = {}) {
+class swift::storage::loopbacks (
+  $args     = {},
+  $defaults = {},
+) {
  create_resources(swift::storage::loopback, $args, $defaults)
 }
--- a/manifests/storage/mount.pp
+++ b/manifests/storage/mount.pp
@@ -24,17 +24,16 @@ define swift::storage::mount(
  Boolean $loopback                  = false,
  String[1] $fstype                  = 'xfs'
 ) {
-
  include swift::deps
  include swift::params

-  if($loopback){
+  if $loopback {
    $options = 'noatime,nodiratime,nofail,loop'
  } else {
    $options = 'noatime,nodiratime,nofail'
  }

-  if($fstype == 'xfs'){
+  if $fstype == 'xfs' {
    $fsoptions = 'logbufs=8'
  } else {
    $fsoptions = 'user_xattr'
--- a/manifests/storage/node.pp
+++ b/manifests/storage/node.pp
@@ -51,7 +51,6 @@ define swift::storage::node(
  $storage_local_net_ip = '127.0.0.1',
  $policy_index         = undef,
 ) {
-
  include swift::deps

  Swift::Storage::Server {
@@ -94,5 +93,4 @@ define swift::storage::node(
    zone   => $zone,
    weight => $weight,
  }
-
 }
--- a/manifests/storage/object.pp
+++ b/manifests/storage/object.pp
@@ -33,7 +33,6 @@ class swift::storage::object(
  String[1] $config_file_name              = 'object-server.conf',
  Swift::ServiceProvider $service_provider = $swift::params::service_provider
 ) inherits swift::params {
-
  include swift::deps

  swift::storage::generic { 'object':
--- a/manifests/storage/policy.pp
+++ b/manifests/storage/policy.pp
@@ -1,4 +1,4 @@
-# Class swift::storage::policy
+# Define swift::storage::policy
 #
 # Setting any optional parameter to undef will remove it
 # from the storage policy defined in swift.conf.
@@ -70,7 +70,6 @@ define swift::storage::policy(
  $ec_num_parity_fragments = undef,
  $ec_object_segment_size  = undef,
 ) {
-
  include swift::deps

  Swift_storage_policy<| |> ~> Service<| tag == 'swift-service' |>
@@ -95,5 +94,4 @@ define swift::storage::policy(
    ec_num_parity_fragments => $ec_num_parity_fragments,
    ec_object_segment_size  => $ec_object_segment_size,
  }
-
 }
--- a/manifests/storage/server.pp
+++ b/manifests/storage/server.pp
@@ -362,7 +362,6 @@ define swift::storage::server(
  $container_sharder_node_timeout                        = $facts['os_service_default'],
  Boolean $purge_config                                  = false,
 ) {
-
  include swift::deps
  include swift::params

--- a/manifests/storage/xfs.pp
+++ b/manifests/storage/xfs.pp
@@ -56,7 +56,6 @@ define swift::storage::xfs(
  Boolean $manage_filesystem                = true,
  String[1] $label                          = $name,
 ) {
-
  include swift::deps
  include swift::params
  include swift::xfs
@@ -81,7 +80,7 @@ define swift::storage::xfs(
    }
  }

-  if(!defined(File[$mnt_base_dir])) {
+  if !defined(File[$mnt_base_dir]) {
    file { $mnt_base_dir:
      ensure  => directory,
      owner   => 'root',
--- a/manifests/wsgi/uwsgi_account.pp
+++ b/manifests/wsgi/uwsgi_account.pp
@@ -21,7 +21,6 @@ class swift::wsgi::uwsgi_account (
  $processes         = $facts['os_workers'],
  $listen_queue_size = 100,
 ) {
-
  include swift::deps

  if $facts['os']['name'] != 'Debian' {
--- a/manifests/wsgi/uwsgi_container.pp
+++ b/manifests/wsgi/uwsgi_container.pp
@@ -21,7 +21,6 @@ class swift::wsgi::uwsgi_container (
  $processes         = $facts['os_workers'],
  $listen_queue_size = 100,
 ) {
-
  include swift::deps

  if $facts['os']['name'] != 'Debian' {
--- a/manifests/wsgi/uwsgi_proxy.pp
+++ b/manifests/wsgi/uwsgi_proxy.pp
@@ -21,7 +21,6 @@ class swift::wsgi::uwsgi_proxy (
  $processes         = $facts['os_workers'],
  $listen_queue_size = 100,
 ) {
-
  include swift::deps

  if $facts['os']['name'] != 'Debian' {
--- a/manifests/xfs.pp
+++ b/manifests/xfs.pp
@@ -2,10 +2,8 @@
 # package dependencies for creating
 # xfs partitions
 class swift::xfs {
-
  include swift::deps

  $packages = ['xfsprogs', 'parted']
  stdlib::ensure_packages($packages)
-
 }