From fe82252e68af1d94c981668f54f87dd3f7baf595 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 19 Aug 2025 10:06:56 +0900 Subject: [PATCH] Prepare for new lint plugins This fixes a few lint warnings/errors detected by the following plugins we aim to enable soon. - puppet-lint-file_ensure-check - puppet-lint-trailing_comma-check - puppet-lint-topscope-variable-check Change-Id: Iec7e1c83a461c8b018938195312d02b578e67365 Signed-off-by: Takashi Kajinami --- examples/all.pp | 2 +- manifests/client.pp | 2 +- manifests/containerreconciler.pp | 10 ++++---- manifests/dispersion.pp | 4 ++-- manifests/init.pp | 2 +- manifests/internal_client.pp | 8 +++---- manifests/keymaster.pp | 4 ++-- manifests/memcache.pp | 4 ++-- manifests/objectexpirer.pp | 14 +++++------ manifests/proxy.pp | 14 +++++------ manifests/proxy/ceilometer.pp | 4 ++-- manifests/proxy/cname_lookup.pp | 2 +- manifests/ringserver.pp | 8 +++---- manifests/service.pp | 6 ++--- manifests/storage.pp | 4 ++-- manifests/storage/account.pp | 8 +++---- manifests/storage/all.pp | 4 ++-- manifests/storage/container.pp | 12 +++++----- manifests/storage/cron/recon.pp | 2 +- manifests/storage/drive_audit.pp | 8 +++---- manifests/storage/filter/backend_ratelimit.pp | 20 ++++++++-------- manifests/storage/generic.pp | 8 +++---- manifests/storage/mount.pp | 4 ++-- manifests/storage/node.pp | 8 +++---- manifests/storage/object.pp | 10 ++++---- manifests/storage/server.pp | 24 +++++++++---------- 26 files changed, 98 insertions(+), 98 deletions(-) diff --git a/examples/all.pp b/examples/all.pp index a3812c27..19caf55b 100644 --- a/examples/all.pp +++ b/examples/all.pp @@ -87,5 +87,5 @@ class { 'swift::proxy::tempauth': 'key' => 'testing3', 'groups' => [], }, - ] + ], } diff --git a/manifests/client.pp b/manifests/client.pp index e48cea38..3f3695d8 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -17,7 +17,7 @@ class swift::client ( package { 'swiftclient': ensure => $ensure, - name => $::swift::params::client_package, + name => $swift::params::client_package, tag => 'openstack', } diff --git a/manifests/containerreconciler.pp b/manifests/containerreconciler.pp index 6ef69a32..5f68699d 100644 --- a/manifests/containerreconciler.pp +++ b/manifests/containerreconciler.pp @@ -51,7 +51,7 @@ # set service_provider to "swiftinit". When enable is true the provider # will populate boot files that start swift using swift-init at boot. # See README for more details. -# Defaults to $::swift::params::service_provider. +# Defaults to $swift::params::service_provider. # # [*memcache_servers*] # (optional) A list of the memcache servers to be used. Entries should be in @@ -123,7 +123,7 @@ class swift::containerreconciler( $processes = $facts['os_service_default'], $reclaim_age = $facts['os_service_default'], $request_tries = $facts['os_service_default'], - Swift::ServiceProvider $service_provider = $::swift::params::service_provider, + Swift::ServiceProvider $service_provider = $swift::params::service_provider, $memcache_servers = ['127.0.0.1:11211'], $cache_tls_enabled = $facts['os_service_default'], $cache_tls_cafile = $facts['os_service_default'], @@ -151,10 +151,10 @@ class swift::containerreconciler( file { '/etc/swift/container-reconciler.conf': ensure => 'file', owner => 'root', - group => $::swift::params::group, + group => $swift::params::group, mode => '0640', require => Anchor['swift::config::begin'], - before => Anchor['swift::config::end'] + before => Anchor['swift::config::end'], } File['/etc/swift/container-reconciler.conf'] -> Swift_container_reconciler_config<||> @@ -214,7 +214,7 @@ class swift::containerreconciler( } swift::service { 'swift-container-reconciler': - os_family_service_name => $::swift::params::container_reconciler_service_name, + os_family_service_name => $swift::params::container_reconciler_service_name, service_ensure => $service_ensure, enabled => $enabled, config_file_name => 'container-reconciler.conf', diff --git a/manifests/dispersion.pp b/manifests/dispersion.pp index 8ff2f8a8..4d8fcab1 100644 --- a/manifests/dispersion.pp +++ b/manifests/dispersion.pp @@ -87,8 +87,8 @@ class swift::dispersion ( file { '/etc/swift/dispersion.conf': ensure => file, - owner => $::swift::params::user, - group => $::swift::params::group, + owner => $swift::params::user, + group => $swift::params::group, mode => '0640', } diff --git a/manifests/init.pp b/manifests/init.pp index 2fe59a7b..7d180dc1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -61,7 +61,7 @@ class swift( package { 'swift': ensure => $package_ensure, - name => $::swift::params::package_name, + name => $swift::params::package_name, tag => ['openstack', 'swift-package'], } diff --git a/manifests/internal_client.pp b/manifests/internal_client.pp index 11ceab55..8fa9cf16 100644 --- a/manifests/internal_client.pp +++ b/manifests/internal_client.pp @@ -6,7 +6,7 @@ # # [*user*] # (optional) User to run as -# Defaults to $::swift::params::user. +# Defaults to $swift::params::user. # # [*pipeline*] # (optional) The list of elements of the internal client pipeline. @@ -69,7 +69,7 @@ # Defaults to false. # class swift::internal_client ( - $user = $::swift::params::user, + $user = $swift::params::user, Swift::Pipeline $pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'], $object_chunk_size = $facts['os_service_default'], $client_chunk_size = $facts['os_service_default'], @@ -100,10 +100,10 @@ class swift::internal_client ( file { '/etc/swift/internal-client.conf': ensure => 'file', owner => 'root', - group => $::swift::params::group, + group => $swift::params::group, mode => '0640', require => Anchor['swift::config::begin'], - before => Anchor['swift::config::end'] + before => Anchor['swift::config::end'], } File['/etc/swift/internal-client.conf'] -> Swift_internal_client_config<||> diff --git a/manifests/keymaster.pp b/manifests/keymaster.pp index 640e5e60..9ffdb27e 100644 --- a/manifests/keymaster.pp +++ b/manifests/keymaster.pp @@ -97,10 +97,10 @@ class swift::keymaster( file { '/etc/swift/keymaster.conf': ensure => 'file', owner => 'root', - group => $::swift::params::group, + group => $swift::params::group, mode => '0640', require => Anchor['swift::config::begin'], - before => Anchor['swift::config::end'] + before => Anchor['swift::config::end'], } File['/etc/swift/keymaster.conf'] -> Swift_keymaster_config<||> diff --git a/manifests/memcache.pp b/manifests/memcache.pp index 97455966..064f81cb 100644 --- a/manifests/memcache.pp +++ b/manifests/memcache.pp @@ -87,10 +87,10 @@ class swift::memcache ( file { '/etc/swift/memcache.conf': ensure => 'file', owner => 'root', - group => $::swift::params::group, + group => $swift::params::group, mode => '0640', require => Anchor['swift::config::begin'], - before => Anchor['swift::config::end'] + before => Anchor['swift::config::end'], } File['/etc/swift/memcache.conf'] -> Swift_memcache_config<||> diff --git a/manifests/objectexpirer.pp b/manifests/objectexpirer.pp index 060a6943..cf32a58d 100644 --- a/manifests/objectexpirer.pp +++ b/manifests/objectexpirer.pp @@ -63,7 +63,7 @@ # service_provider to "swiftinit". When enable is true the provider # will populate boot files that start swift using swift-init at boot. # See README for more details. -# Defaults to $::swift::params::service_provider. +# Defaults to $swift::params::service_provider. # # [*memcache_servers*] # (optional) @@ -143,7 +143,7 @@ class swift::objectexpirer( $tasks_per_second = $facts['os_service_default'], $recon_cache_path = $facts['os_service_default'], $report_interval = $facts['os_service_default'], - Swift::ServiceProvider $service_provider = $::swift::params::service_provider, + Swift::ServiceProvider $service_provider = $swift::params::service_provider, $memcache_servers = ['127.0.0.1:11211'], $cache_tls_enabled = $facts['os_service_default'], $cache_tls_cafile = $facts['os_service_default'], @@ -168,10 +168,10 @@ class swift::objectexpirer( # On Red Hat platforms, it may be defined already, # because it is part of openstack-swift-proxy - if $::swift::params::object_expirer_package_name != $::swift::params::proxy_package_name { + if $swift::params::object_expirer_package_name != $swift::params::proxy_package_name { package { 'swift-object-expirer': ensure => $package_ensure, - name => $::swift::params::object_expirer_package_name, + name => $swift::params::object_expirer_package_name, tag => ['openstack', 'swift-package'], } } @@ -183,10 +183,10 @@ class swift::objectexpirer( file { '/etc/swift/object-expirer.conf': ensure => 'file', owner => 'root', - group => $::swift::params::group, + group => $swift::params::group, mode => '0640', require => Anchor['swift::config::begin'], - before => Anchor['swift::config::end'] + before => Anchor['swift::config::end'], } File['/etc/swift/object-expirer.conf'] -> Swift_object_expirer_config<||> @@ -253,7 +253,7 @@ class swift::objectexpirer( } swift::service { 'swift-object-expirer': - os_family_service_name => $::swift::params::object_expirer_service_name, + os_family_service_name => $swift::params::object_expirer_service_name, service_ensure => $service_ensure, enabled => $enabled, config_file_name => 'object-expirer.conf', diff --git a/manifests/proxy.pp b/manifests/proxy.pp index e97abc9d..74c7ef4e 100644 --- a/manifests/proxy.pp +++ b/manifests/proxy.pp @@ -191,7 +191,7 @@ # service_provider to "swiftinit". When enable is true the provider # will populate boot files that start swift using swift-init at boot. # See README for more details. -# Defaults to $::swift::params::service_provider. +# Defaults to $swift::params::service_provider. # # [*purge_config*] # (optional) Whether to set only the specified config options @@ -250,7 +250,7 @@ class swift::proxy( Boolean $manage_service = true, Boolean $enabled = true, $package_ensure = 'present', - Swift::ServiceProvider $service_provider = $::swift::params::service_provider, + Swift::ServiceProvider $service_provider = $swift::params::service_provider, Boolean $purge_config = false, ) inherits swift::params { @@ -275,7 +275,7 @@ class swift::proxy( package { 'swift-proxy': ensure => $package_ensure, - name => $::swift::params::proxy_package_name, + name => $swift::params::proxy_package_name, tag => ['openstack', 'swift-package'], } @@ -286,10 +286,10 @@ class swift::proxy( file { '/etc/swift/proxy-server.conf': ensure => 'file', owner => 'root', - group => $::swift::params::group, + group => $swift::params::group, mode => '0640', require => Anchor['swift::config::begin'], - before => Anchor['swift::config::end'] + before => Anchor['swift::config::end'], } File['/etc/swift/proxy-server.conf'] -> Swift_proxy_config<||> @@ -299,7 +299,7 @@ class swift::proxy( 'DEFAULT/cert_file': value => $cert_file; 'DEFAULT/key_file': value => $key_file; 'DEFAULT/workers': value => $workers; - 'DEFAULT/user': value => $::swift::params::user; + 'DEFAULT/user': value => $swift::params::user; 'DEFAULT/log_name': value => $log_name; 'DEFAULT/log_facility': value => $log_facility; 'DEFAULT/log_level': value => $log_level; @@ -398,7 +398,7 @@ class swift::proxy( # Require 'swift::proxy::' classes for each of the elements in pipeline. swift::service { 'swift-proxy-server': - os_family_service_name => $::swift::params::proxy_server_service_name, + os_family_service_name => $swift::params::proxy_server_service_name, service_ensure => $service_ensure, enabled => $enabled, config_file_name => 'proxy-server.conf', diff --git a/manifests/proxy/ceilometer.pp b/manifests/proxy/ceilometer.pp index 4edf65d4..d9a17a32 100644 --- a/manifests/proxy/ceilometer.pp +++ b/manifests/proxy/ceilometer.pp @@ -238,7 +238,7 @@ class swift::proxy::ceilometer( file { '/etc/swift/ceilometer.conf': ensure => 'file', owner => 'root', - group => $::swift::params::group, + group => $swift::params::group, mode => '0640', require => Anchor['swift::config::begin'], before => Anchor['swift::config::end'], @@ -294,7 +294,7 @@ class swift::proxy::ceilometer( package { 'python-ceilometermiddleware': ensure => $ensure, - name => $::swift::params::ceilometermiddleware_package_name, + name => $swift::params::ceilometermiddleware_package_name, tag => ['openstack', 'swift-support-package'], } diff --git a/manifests/proxy/cname_lookup.pp b/manifests/proxy/cname_lookup.pp index ab33d2d0..dfb55f20 100644 --- a/manifests/proxy/cname_lookup.pp +++ b/manifests/proxy/cname_lookup.pp @@ -72,7 +72,7 @@ class swift::proxy::cname_lookup( package { 'python-dnspython': ensure => 'present', - name => $::swift::params::dnspython_package_name, + name => $swift::params::dnspython_package_name, tag => ['openstack', 'swift-support-package'], } } diff --git a/manifests/ringserver.pp b/manifests/ringserver.pp index c7c05243..d235b1cc 100644 --- a/manifests/ringserver.pp +++ b/manifests/ringserver.pp @@ -32,13 +32,13 @@ class swift::ringserver( $local_net_ip, $max_connections = 5, - $rsync_use_xinetd = $::swift::params::xinetd_available, + $rsync_use_xinetd = $swift::params::xinetd_available, ) inherits swift::params { include swift::deps Class['swift::ringbuilder'] -> Class['swift::ringserver'] - if $rsync_use_xinetd and ! $::swift::params::xinetd_available { + if $rsync_use_xinetd and ! $swift::params::xinetd_available { fail('xinetd is not available in this distro') } @@ -51,8 +51,8 @@ class swift::ringserver( rsync::server::module { 'swift_server': path => '/etc/swift', lock_file => '/var/lock/swift_server.lock', - uid => $::swift::params::user, - gid => $::swift::params::group, + uid => $swift::params::user, + gid => $swift::params::group, max_connections => $max_connections, read_only => true, } diff --git a/manifests/service.pp b/manifests/service.pp index 50f03734..7944527e 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -29,7 +29,7 @@ # service_provider to "swiftinit". When enable is true the provider # will populate boot files that start swift using swift-init at boot. # See README for more details. -# Defaults to $::swift::params::service_provider. +# Defaults to $swift::params::service_provider. # # [*service_subscribe*] # (optional) Parameter used to pass in resources that this service should @@ -46,7 +46,7 @@ define swift::service( String[1] $config_file_name, $service_ensure = undef, Boolean $enabled = true, - Swift::ServiceProvider $service_provider = $::swift::params::service_provider, + Swift::ServiceProvider $service_provider = $swift::params::service_provider, $service_subscribe = undef, $service_require = undef, Optional[String[1]] $service_tag = undef, @@ -55,7 +55,7 @@ define swift::service( 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") } diff --git a/manifests/storage.pp b/manifests/storage.pp index 0d752da2..2185acbe 100644 --- a/manifests/storage.pp +++ b/manifests/storage.pp @@ -26,12 +26,12 @@ # class swift::storage( $storage_local_net_ip, - $rsync_use_xinetd = $::swift::params::xinetd_available, + $rsync_use_xinetd = $swift::params::xinetd_available, ) inherits swift::params { include swift::deps - if $rsync_use_xinetd and ! $::swift::params::xinetd_available { + if $rsync_use_xinetd and ! $swift::params::xinetd_available { fail('xinetd is not available in this distro') } diff --git a/manifests/storage/account.pp b/manifests/storage/account.pp index 400993ae..efa33568 100644 --- a/manifests/storage/account.pp +++ b/manifests/storage/account.pp @@ -24,14 +24,14 @@ # service_provider to "swiftinit". When enable is true the provider # will populate boot files that start swift using swift-init at boot. # See README for more details. -# Defaults to $::swift::params::service_provider. +# Defaults to $swift::params::service_provider. # class swift::storage::account( Boolean $manage_service = true, Boolean $enabled = true, $package_ensure = 'present', String[1] $config_file_name = 'account-server.conf', - Swift::ServiceProvider $service_provider = $::swift::params::service_provider + Swift::ServiceProvider $service_provider = $swift::params::service_provider ) inherits swift::params { include swift::deps @@ -41,7 +41,7 @@ class swift::storage::account( enabled => $enabled, package_ensure => $package_ensure, config_file_name => $config_file_name, - service_provider => $service_provider + service_provider => $service_provider, } if $manage_service { @@ -52,7 +52,7 @@ class swift::storage::account( } swift::service { 'swift-account-reaper': - os_family_service_name => $::swift::params::account_reaper_service_name, + os_family_service_name => $swift::params::account_reaper_service_name, service_ensure => $service_ensure, enabled => $enabled, config_file_name => $config_file_name, diff --git a/manifests/storage/all.pp b/manifests/storage/all.pp index f2a496a5..5d20deba 100644 --- a/manifests/storage/all.pp +++ b/manifests/storage/all.pp @@ -174,7 +174,7 @@ class swift::storage::all( $rsync_timeout = $facts['os_service_default'], $rsync_bwlimit = $facts['os_service_default'], $splice = false, - $rsync_use_xinetd = $::swift::params::xinetd_available, + $rsync_use_xinetd = $swift::params::xinetd_available, ) inherits swift::params { include swift::deps @@ -194,7 +194,7 @@ from 6001 to 6201 and will be changed in a later release") from 6002 to 6202 and will be changed in a later release") } - if $rsync_use_xinetd and ! $::swift::params::xinetd_available { + if $rsync_use_xinetd and ! $swift::params::xinetd_available { fail('xinetd is not available in this distro') } diff --git a/manifests/storage/container.pp b/manifests/storage/container.pp index a925380d..1935c06b 100644 --- a/manifests/storage/container.pp +++ b/manifests/storage/container.pp @@ -29,7 +29,7 @@ # service_provider to "swiftinit". When enable is true the provider # will populate boot files that start swift using swift-init at boot. # See README for more details. -# Defaults to $::swift::params::service_provider. +# Defaults to $swift::params::service_provider. # class swift::storage::container( Boolean $manage_service = true, @@ -37,7 +37,7 @@ class swift::storage::container( $package_ensure = 'present', Array[String[1]] $allowed_sync_hosts = ['127.0.0.1'], String[1] $config_file_name = 'container-server.conf', - Swift::ServiceProvider $service_provider = $::swift::params::service_provider + Swift::ServiceProvider $service_provider = $swift::params::service_provider ) inherits swift::params { include swift::deps @@ -47,7 +47,7 @@ class swift::storage::container( enabled => $enabled, package_ensure => $package_ensure, config_file_name => $config_file_name, - service_provider => $service_provider + service_provider => $service_provider, } if $manage_service { @@ -58,7 +58,7 @@ class swift::storage::container( } swift::service { 'swift-container-updater': - os_family_service_name => $::swift::params::container_updater_service_name, + os_family_service_name => $swift::params::container_updater_service_name, service_ensure => $service_ensure, enabled => $enabled, config_file_name => $config_file_name, @@ -67,7 +67,7 @@ class swift::storage::container( } swift::service { 'swift-container-sync': - os_family_service_name => $::swift::params::container_sync_service_name, + os_family_service_name => $swift::params::container_sync_service_name, service_ensure => $service_ensure, enabled => $enabled, config_file_name => $config_file_name, @@ -76,7 +76,7 @@ class swift::storage::container( } swift::service { 'swift-container-sharder': - os_family_service_name => $::swift::params::container_sharder_service_name, + os_family_service_name => $swift::params::container_sharder_service_name, service_ensure => $service_ensure, enabled => $enabled, config_file_name => $config_file_name, diff --git a/manifests/storage/cron/recon.pp b/manifests/storage/cron/recon.pp index 7237eeb4..0991fcd1 100644 --- a/manifests/storage/cron/recon.pp +++ b/manifests/storage/cron/recon.pp @@ -51,7 +51,7 @@ class swift::storage::cron::recon( $month = '*', $weekday = '*', $configfile = '/etc/swift/object-server.conf', - $user = $::swift::params::user + $user = $swift::params::user ) inherits swift::params { include swift::deps diff --git a/manifests/storage/drive_audit.pp b/manifests/storage/drive_audit.pp index 560937a3..de60a080 100644 --- a/manifests/storage/drive_audit.pp +++ b/manifests/storage/drive_audit.pp @@ -6,7 +6,7 @@ # # [*user*] # (Optional) User with access to swift files. -# Defaults to $::swift::params::user. +# Defaults to $swift::params::user. # # [*minute*] # (Optional) Defaults to '1'. @@ -102,7 +102,7 @@ # class swift::storage::drive_audit( # cron options - $user = $::swift::params::user, + $user = $swift::params::user, $minute = 1, $hour = 0, $monthday = '*', @@ -138,10 +138,10 @@ class swift::storage::drive_audit( file { '/etc/swift/drive-audit.conf': ensure => 'file', owner => 'root', - group => $::swift::params::group, + group => $swift::params::group, mode => '0640', require => Anchor['swift::config::begin'], - before => Anchor['swift::config::end'] + before => Anchor['swift::config::end'], } File['/etc/swift/drive-audit.conf'] -> Swift_drive_audit_config<||> diff --git a/manifests/storage/filter/backend_ratelimit.pp b/manifests/storage/filter/backend_ratelimit.pp index 0213e576..22d1f267 100644 --- a/manifests/storage/filter/backend_ratelimit.pp +++ b/manifests/storage/filter/backend_ratelimit.pp @@ -78,34 +78,34 @@ define swift::storage::filter::backend_ratelimit( create_resources($config_type, { 'filter:backend_ratelimit/use' => { - 'value' => 'egg:swift#backend_ratelimit' + 'value' => 'egg:swift#backend_ratelimit', }, 'filter:backend_ratelimit/requests_per_device_per_second' => { - 'value' => $requests_per_device_per_second + 'value' => $requests_per_device_per_second, }, 'filter:backend_ratelimit/delete_requests_per_device_per_second' => { - 'value' => $delete_requests_per_device_per_second + 'value' => $delete_requests_per_device_per_second, }, 'filter:backend_ratelimit/get_requests_per_device_per_second' => { - 'value' => $get_requests_per_device_per_second + 'value' => $get_requests_per_device_per_second, }, 'filter:backend_ratelimit/head_requests_per_device_per_second' => { - 'value' => $head_requests_per_device_per_second + 'value' => $head_requests_per_device_per_second, }, 'filter:backend_ratelimit/post_requests_per_device_per_second' => { - 'value' => $post_requests_per_device_per_second + 'value' => $post_requests_per_device_per_second, }, 'filter:backend_ratelimit/put_requests_per_device_per_second' => { - 'value' => $put_requests_per_device_per_second + 'value' => $put_requests_per_device_per_second, }, 'filter:backend_ratelimit/replicate_requests_per_device_per_second' => { - 'value' => $replicate_requests_per_device_per_second + 'value' => $replicate_requests_per_device_per_second, }, 'filter:backend_ratelimit/update_requests_per_device_per_second' => { - 'value' => $update_requests_per_device_per_second + 'value' => $update_requests_per_device_per_second, }, 'filter:backend_ratelimit/requests_per_device_rate_buffer' => { - 'value' => $requests_per_device_rate_buffer + 'value' => $requests_per_device_rate_buffer, } }) diff --git a/manifests/storage/generic.pp b/manifests/storage/generic.pp index c7a7c6d2..dd0c92a1 100644 --- a/manifests/storage/generic.pp +++ b/manifests/storage/generic.pp @@ -28,7 +28,7 @@ # service_provider to "swiftinit". When enable is true the provider # will populate boot files that start swift using swift-init at boot. # See README for more details. -# Defaults to $::swift::params::service_provider. +# Defaults to $swift::params::service_provider. # # == Dependencies # Requires Class[swift::storage] @@ -39,7 +39,7 @@ define swift::storage::generic( Boolean $enabled = true, $package_ensure = 'present', String[1] $config_file_name = "${name}-server.conf", - Swift::ServiceProvider $service_provider = $::swift::params::service_provider + Swift::ServiceProvider $service_provider = $swift::params::service_provider ) { include swift::deps @@ -55,8 +55,8 @@ define swift::storage::generic( file { "/etc/swift/${type}-server/": ensure => directory, - owner => $::swift::params::user, - group => $::swift::params::group, + owner => $swift::params::user, + group => $swift::params::group, require => Anchor['swift::config::begin'], before => Anchor['swift::config::end'], } diff --git a/manifests/storage/mount.pp b/manifests/storage/mount.pp index eb163bc9..e36b16e5 100644 --- a/manifests/storage/mount.pp +++ b/manifests/storage/mount.pp @@ -71,8 +71,8 @@ define swift::storage::mount( before => Anchor['swift::config::end'], } - $user = $::swift::params::user - $group = $::swift::params::group + $user = $swift::params::user + $group = $swift::params::group exec { "fix_mount_permissions_${name}": command => ['chown', '-R', "${user}:${group}", "${mnt_base_dir}/${name}"], diff --git a/manifests/storage/node.pp b/manifests/storage/node.pp index d67c0c5a..866458b3 100644 --- a/manifests/storage/node.pp +++ b/manifests/storage/node.pp @@ -24,11 +24,11 @@ # # [*owner*] # (optional) Owner (uid) of rsync server. -# Defaults to $::swift::params::user. +# Defaults to $swift::params::user. # # [*group*] # (optional) Group (gid) of rsync server. -# Defaults to $::swift::params::group. +# Defaults to $swift::params::group. # # [*max_connections*] # (optional) maximum number of simultaneous connections allowed. @@ -58,8 +58,8 @@ define swift::storage::node( storage_local_net_ip => $storage_local_net_ip, devices => $mnt_base_dir, max_connections => $max_connections, - owner => pick($owner, $::swift::params::user), - group => pick($group, $::swift::params::group), + owner => pick($owner, $swift::params::user), + group => pick($group, $swift::params::group), } swift::storage::server { "60${name}0": diff --git a/manifests/storage/object.pp b/manifests/storage/object.pp index aaf130cf..8db6ceef 100644 --- a/manifests/storage/object.pp +++ b/manifests/storage/object.pp @@ -24,14 +24,14 @@ # service_provider to "swiftinit". When enable is true the provider # will populate boot files that start swift using swift-init at boot. # See README for more details. -# Defaults to $::swift::params::service_provider. +# Defaults to $swift::params::service_provider. # class swift::storage::object( Boolean $manage_service = true, Boolean $enabled = true, $package_ensure = 'present', String[1] $config_file_name = 'object-server.conf', - Swift::ServiceProvider $service_provider = $::swift::params::service_provider + Swift::ServiceProvider $service_provider = $swift::params::service_provider ) inherits swift::params { include swift::deps @@ -41,7 +41,7 @@ class swift::storage::object( enabled => $enabled, package_ensure => $package_ensure, config_file_name => $config_file_name, - service_provider => $service_provider + service_provider => $service_provider, } if $manage_service { @@ -52,7 +52,7 @@ class swift::storage::object( } swift::service { 'swift-object-updater': - os_family_service_name => $::swift::params::object_updater_service_name, + os_family_service_name => $swift::params::object_updater_service_name, service_ensure => $service_ensure, enabled => $enabled, config_file_name => $config_file_name, @@ -61,7 +61,7 @@ class swift::storage::object( } swift::service { 'swift-object-reconstructor': - os_family_service_name => $::swift::params::object_reconstructor_service_name, + os_family_service_name => $swift::params::object_reconstructor_service_name, service_ensure => $service_ensure, enabled => $enabled, config_file_name => $config_file_name, diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp index 36d5a206..2069b8bb 100644 --- a/manifests/storage/server.pp +++ b/manifests/storage/server.pp @@ -30,11 +30,11 @@ # # [*owner*] # (optional) Owner (uid) of rsync server. -# Defaults to $::swift::params::user. +# Defaults to $swift::params::user. # # [*group*] # (optional) Group (gid) of rsync server. -# Defaults to $::swift::params::group. +# Defaults to $swift::params::group. # # [*max_connections*] # (optional) maximum number of simultaneous connections allowed. @@ -99,7 +99,7 @@ # # [*user*] # (optional) User to run as -# Defaults to $::swift::params::user. +# Defaults to $swift::params::user. # # [*workers*] # (optional) Override the number of pre-forked workers that will accept @@ -366,7 +366,7 @@ define swift::storage::server( include swift::deps include swift::params - $user_real = pick($user, $::swift::params::user) + $user_real = pick($user, $swift::params::user) # Fail if ${type-server} isn't included in the pipeline if $pipeline[-1] != "${type}-server" { @@ -386,8 +386,8 @@ define swift::storage::server( rsync::server::module { "${type}_${device_name}": path => $devices, lock_file => "/var/lock/${type}_${device_name}.lock", - uid => pick($owner, $::swift::params::user), - gid => pick($group, $::swift::params::group), + uid => pick($owner, $swift::params::user), + gid => pick($group, $swift::params::group), hosts_allow => $hosts_allow, hosts_deny => $hosts_deny, incoming_chmod => $incoming_chmod, @@ -401,8 +401,8 @@ define swift::storage::server( rsync::server::module { $type: path => $devices, lock_file => "/var/lock/${type}.lock", - uid => pick($owner, $::swift::params::user), - gid => pick($group, $::swift::params::group), + uid => pick($owner, $swift::params::user), + gid => pick($group, $swift::params::group), hosts_allow => $hosts_allow, hosts_deny => $hosts_deny, incoming_chmod => $incoming_chmod, @@ -426,7 +426,7 @@ define swift::storage::server( file { $config_file_full_path: ensure => 'file', owner => 'root', - group => pick($group, $::swift::params::group), + group => pick($group, $swift::params::group), mode => '0640', before => $required_middlewares, } @@ -531,7 +531,7 @@ define swift::storage::server( 'container': { $type_opts = { 'DEFAULT/db_preallocation' => {'value' => $db_preallocation}, - 'DEFAULT/allowed_sync_hosts' => {'value' => join($::swift::storage::container::allowed_sync_hosts, ',')}, + 'DEFAULT/allowed_sync_hosts' => {'value' => join($swift::storage::container::allowed_sync_hosts, ',')}, # container-server # container-auditor # container-replicator @@ -577,10 +577,10 @@ define swift::storage::server( file { '/etc/swift/container-sync-realms.conf': ensure => 'file', owner => 'root', - group => pick($group, $::swift::params::group), + group => pick($group, $swift::params::group), mode => '0640', require => Anchor['swift::config::begin'], - before => Anchor['swift::config::end'] + before => Anchor['swift::config::end'], } File['/etc/swift/container-sync-realms.conf'] -> Swift_container_sync_realms_config<||> }