openstack/puppet-swift
Code Issues Proposed changes

Prepare for new lint plugins

Browse Source 
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 <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-19 10:06:56 +09:00
parent 964f0ea134
commit fe82252e68
26 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/all.pp
View File

@@ -87,5 +87,5 @@ class { 'swift::proxy::tempauth':
'key' => 'testing3', 'key' => 'testing3',
'groups' => [], 'groups' => [],
}, },
] ],
} }

2
manifests/client.pp
View File

@@ -17,7 +17,7 @@ class swift::client (
package { 'swiftclient': package { 'swiftclient':
ensure => $ensure, ensure => $ensure,
name => $::swift::params::client_package, name => $swift::params::client_package,
tag => 'openstack', tag => 'openstack',
} }

10
manifests/containerreconciler.pp
View File

@@ -51,7 +51,7 @@
# set service_provider to "swiftinit". When enable is true the provider # set service_provider to "swiftinit". When enable is true the provider
# will populate boot files that start swift using swift-init at boot. # will populate boot files that start swift using swift-init at boot.
# See README for more details. # See README for more details.
# Defaults to $::swift::params::service_provider. # Defaults to $swift::params::service_provider.
# #
# [*memcache_servers*] # [*memcache_servers*]
# (optional) A list of the memcache servers to be used. Entries should be in # (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'], $processes = $facts['os_service_default'],
$reclaim_age = $facts['os_service_default'], $reclaim_age = $facts['os_service_default'],
$request_tries = $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'], $memcache_servers = ['127.0.0.1:11211'],
$cache_tls_enabled = $facts['os_service_default'], $cache_tls_enabled = $facts['os_service_default'],
$cache_tls_cafile = $facts['os_service_default'], $cache_tls_cafile = $facts['os_service_default'],
@@ -151,10 +151,10 @@ class swift::containerreconciler(
file { '/etc/swift/container-reconciler.conf': file { '/etc/swift/container-reconciler.conf':
ensure => 'file', ensure => 'file',
owner => 'root', owner => 'root',
group => $::swift::params::group, group => $swift::params::group,
mode => '0640', mode => '0640',
require => Anchor['swift::config::begin'], 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<||> File['/etc/swift/container-reconciler.conf'] -> Swift_container_reconciler_config<||>
@@ -214,7 +214,7 @@ class swift::containerreconciler(
} }
swift::service { 'swift-container-reconciler': 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, service_ensure => $service_ensure,
enabled => $enabled, enabled => $enabled,
config_file_name => 'container-reconciler.conf', config_file_name => 'container-reconciler.conf',

4
manifests/dispersion.pp
View File

@@ -87,8 +87,8 @@ class swift::dispersion (
file { '/etc/swift/dispersion.conf': file { '/etc/swift/dispersion.conf':
ensure => file, ensure => file,
owner => $::swift::params::user, owner => $swift::params::user,
group => $::swift::params::group, group => $swift::params::group,
mode => '0640', mode => '0640',
} }

2
manifests/init.pp
View File

@@ -61,7 +61,7 @@ class swift(
package { 'swift': package { 'swift':
ensure => $package_ensure, ensure => $package_ensure,
name => $::swift::params::package_name, name => $swift::params::package_name,
tag => ['openstack', 'swift-package'], tag => ['openstack', 'swift-package'],
} }

8
manifests/internal_client.pp
View File

@@ -6,7 +6,7 @@
# #
# [*user*] # [*user*]
# (optional) User to run as # (optional) User to run as
# Defaults to $::swift::params::user. # Defaults to $swift::params::user.
# #
# [*pipeline*] # [*pipeline*]
# (optional) The list of elements of the internal client pipeline. # (optional) The list of elements of the internal client pipeline.
@@ -69,7 +69,7 @@
# Defaults to false. # Defaults to false.
# #
class swift::internal_client ( class swift::internal_client (
$user = $::swift::params::user, $user = $swift::params::user,
Swift::Pipeline $pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'], Swift::Pipeline $pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'],
$object_chunk_size = $facts['os_service_default'], $object_chunk_size = $facts['os_service_default'],
$client_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': file { '/etc/swift/internal-client.conf':
ensure => 'file', ensure => 'file',
owner => 'root', owner => 'root',
group => $::swift::params::group, group => $swift::params::group,
mode => '0640', mode => '0640',
require => Anchor['swift::config::begin'], 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<||> File['/etc/swift/internal-client.conf'] -> Swift_internal_client_config<||>

4
manifests/keymaster.pp
View File

@@ -97,10 +97,10 @@ class swift::keymaster(
file { '/etc/swift/keymaster.conf': file { '/etc/swift/keymaster.conf':
ensure => 'file', ensure => 'file',
owner => 'root', owner => 'root',
group => $::swift::params::group, group => $swift::params::group,
mode => '0640', mode => '0640',
require => Anchor['swift::config::begin'], require => Anchor['swift::config::begin'],
before => Anchor['swift::config::end'] before => Anchor['swift::config::end'],
} }
File['/etc/swift/keymaster.conf'] -> Swift_keymaster_config<||> File['/etc/swift/keymaster.conf'] -> Swift_keymaster_config<||>

4
manifests/memcache.pp
View File

@@ -87,10 +87,10 @@ class swift::memcache (
file { '/etc/swift/memcache.conf': file { '/etc/swift/memcache.conf':
ensure => 'file', ensure => 'file',
owner => 'root', owner => 'root',
group => $::swift::params::group, group => $swift::params::group,
mode => '0640', mode => '0640',
require => Anchor['swift::config::begin'], require => Anchor['swift::config::begin'],
before => Anchor['swift::config::end'] before => Anchor['swift::config::end'],
} }
File['/etc/swift/memcache.conf'] -> Swift_memcache_config<||> File['/etc/swift/memcache.conf'] -> Swift_memcache_config<||>

14
manifests/objectexpirer.pp
View File

@@ -63,7 +63,7 @@
# service_provider to "swiftinit". When enable is true the provider # service_provider to "swiftinit". When enable is true the provider
# will populate boot files that start swift using swift-init at boot. # will populate boot files that start swift using swift-init at boot.
# See README for more details. # See README for more details.
# Defaults to $::swift::params::service_provider. # Defaults to $swift::params::service_provider.
# #
# [*memcache_servers*] # [*memcache_servers*]
# (optional) # (optional)
@@ -143,7 +143,7 @@ class swift::objectexpirer(
$tasks_per_second = $facts['os_service_default'], $tasks_per_second = $facts['os_service_default'],
$recon_cache_path = $facts['os_service_default'], $recon_cache_path = $facts['os_service_default'],
$report_interval = $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'], $memcache_servers = ['127.0.0.1:11211'],
$cache_tls_enabled = $facts['os_service_default'], $cache_tls_enabled = $facts['os_service_default'],
$cache_tls_cafile = $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, # On Red Hat platforms, it may be defined already,
# because it is part of openstack-swift-proxy # 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': package { 'swift-object-expirer':
ensure => $package_ensure, ensure => $package_ensure,
name => $::swift::params::object_expirer_package_name, name => $swift::params::object_expirer_package_name,
tag => ['openstack', 'swift-package'], tag => ['openstack', 'swift-package'],
} }
} }
@@ -183,10 +183,10 @@ class swift::objectexpirer(
file { '/etc/swift/object-expirer.conf': file { '/etc/swift/object-expirer.conf':
ensure => 'file', ensure => 'file',
owner => 'root', owner => 'root',
group => $::swift::params::group, group => $swift::params::group,
mode => '0640', mode => '0640',
require => Anchor['swift::config::begin'], 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<||> File['/etc/swift/object-expirer.conf'] -> Swift_object_expirer_config<||>
@@ -253,7 +253,7 @@ class swift::objectexpirer(
} }
swift::service { 'swift-object-expirer': 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, service_ensure => $service_ensure,
enabled => $enabled, enabled => $enabled,
config_file_name => 'object-expirer.conf', config_file_name => 'object-expirer.conf',

14
manifests/proxy.pp
View File

@@ -191,7 +191,7 @@
# service_provider to "swiftinit". When enable is true the provider # service_provider to "swiftinit". When enable is true the provider
# will populate boot files that start swift using swift-init at boot. # will populate boot files that start swift using swift-init at boot.
# See README for more details. # See README for more details.
# Defaults to $::swift::params::service_provider. # Defaults to $swift::params::service_provider.
# #
# [*purge_config*] # [*purge_config*]
# (optional) Whether to set only the specified config options # (optional) Whether to set only the specified config options
@@ -250,7 +250,7 @@ class swift::proxy(
Boolean $manage_service = true, Boolean $manage_service = true,
Boolean $enabled = true, Boolean $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
Swift::ServiceProvider $service_provider = $::swift::params::service_provider, Swift::ServiceProvider $service_provider = $swift::params::service_provider,
Boolean $purge_config = false, Boolean $purge_config = false,
) inherits swift::params { ) inherits swift::params {
@@ -275,7 +275,7 @@ class swift::proxy(
package { 'swift-proxy': package { 'swift-proxy':
ensure => $package_ensure, ensure => $package_ensure,
name => $::swift::params::proxy_package_name, name => $swift::params::proxy_package_name,
tag => ['openstack', 'swift-package'], tag => ['openstack', 'swift-package'],
} }
@@ -286,10 +286,10 @@ class swift::proxy(
file { '/etc/swift/proxy-server.conf': file { '/etc/swift/proxy-server.conf':
ensure => 'file', ensure => 'file',
owner => 'root', owner => 'root',
group => $::swift::params::group, group => $swift::params::group,
mode => '0640', mode => '0640',
require => Anchor['swift::config::begin'], require => Anchor['swift::config::begin'],
before => Anchor['swift::config::end'] before => Anchor['swift::config::end'],
} }
File['/etc/swift/proxy-server.conf'] -> Swift_proxy_config<||> File['/etc/swift/proxy-server.conf'] -> Swift_proxy_config<||>
@@ -299,7 +299,7 @@ class swift::proxy(
'DEFAULT/cert_file': value => $cert_file; 'DEFAULT/cert_file': value => $cert_file;
'DEFAULT/key_file': value => $key_file; 'DEFAULT/key_file': value => $key_file;
'DEFAULT/workers': value => $workers; 'DEFAULT/workers': value => $workers;
'DEFAULT/user': value => $::swift::params::user; 'DEFAULT/user': value => $swift::params::user;
'DEFAULT/log_name': value => $log_name; 'DEFAULT/log_name': value => $log_name;
'DEFAULT/log_facility': value => $log_facility; 'DEFAULT/log_facility': value => $log_facility;
'DEFAULT/log_level': value => $log_level; 'DEFAULT/log_level': value => $log_level;
@@ -398,7 +398,7 @@ class swift::proxy(
# Require 'swift::proxy::' classes for each of the elements in pipeline. # Require 'swift::proxy::' classes for each of the elements in pipeline.
swift::service { 'swift-proxy-server': 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, service_ensure => $service_ensure,
enabled => $enabled, enabled => $enabled,
config_file_name => 'proxy-server.conf', config_file_name => 'proxy-server.conf',

4
manifests/proxy/ceilometer.pp
View File

@@ -238,7 +238,7 @@ class swift::proxy::ceilometer(
file { '/etc/swift/ceilometer.conf': file { '/etc/swift/ceilometer.conf':
ensure => 'file', ensure => 'file',
owner => 'root', owner => 'root',
group => $::swift::params::group, group => $swift::params::group,
mode => '0640', mode => '0640',
require => Anchor['swift::config::begin'], require => Anchor['swift::config::begin'],
before => Anchor['swift::config::end'], before => Anchor['swift::config::end'],
@@ -294,7 +294,7 @@ class swift::proxy::ceilometer(
package { 'python-ceilometermiddleware': package { 'python-ceilometermiddleware':
ensure => $ensure, ensure => $ensure,
name => $::swift::params::ceilometermiddleware_package_name, name => $swift::params::ceilometermiddleware_package_name,
tag => ['openstack', 'swift-support-package'], tag => ['openstack', 'swift-support-package'],
} }

2
manifests/proxy/cname_lookup.pp
View File

@@ -72,7 +72,7 @@ class swift::proxy::cname_lookup(
package { 'python-dnspython': package { 'python-dnspython':
ensure => 'present', ensure => 'present',
name => $::swift::params::dnspython_package_name, name => $swift::params::dnspython_package_name,
tag => ['openstack', 'swift-support-package'], tag => ['openstack', 'swift-support-package'],
} }
} }

8
manifests/ringserver.pp
View File

@@ -32,13 +32,13 @@
class swift::ringserver( class swift::ringserver(
$local_net_ip, $local_net_ip,
$max_connections = 5, $max_connections = 5,
$rsync_use_xinetd = $::swift::params::xinetd_available, $rsync_use_xinetd = $swift::params::xinetd_available,
) inherits swift::params { ) inherits swift::params {
include swift::deps include swift::deps
Class['swift::ringbuilder'] -> Class['swift::ringserver'] 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') fail('xinetd is not available in this distro')
} }
@@ -51,8 +51,8 @@ class swift::ringserver(
rsync::server::module { 'swift_server': rsync::server::module { 'swift_server':
path => '/etc/swift', path => '/etc/swift',
lock_file => '/var/lock/swift_server.lock', lock_file => '/var/lock/swift_server.lock',
uid => $::swift::params::user, uid => $swift::params::user,
gid => $::swift::params::group, gid => $swift::params::group,
max_connections => $max_connections, max_connections => $max_connections,
read_only => true, read_only => true,
} }

6
manifests/service.pp
View File

@@ -29,7 +29,7 @@
# service_provider to "swiftinit". When enable is true the provider # service_provider to "swiftinit". When enable is true the provider
# will populate boot files that start swift using swift-init at boot. # will populate boot files that start swift using swift-init at boot.
# See README for more details. # See README for more details.
# Defaults to $::swift::params::service_provider. # Defaults to $swift::params::service_provider.
# #
# [*service_subscribe*] # [*service_subscribe*]
# (optional) Parameter used to pass in resources that this service should # (optional) Parameter used to pass in resources that this service should
@@ -46,7 +46,7 @@ define swift::service(
String[1] $config_file_name, String[1] $config_file_name,
$service_ensure = undef, $service_ensure = undef,
Boolean $enabled = true, Boolean $enabled = true,
Swift::ServiceProvider $service_provider = $::swift::params::service_provider, Swift::ServiceProvider $service_provider = $swift::params::service_provider,
$service_subscribe = undef, $service_subscribe = undef,
$service_require = undef, $service_require = undef,
Optional[String[1]] $service_tag = undef, Optional[String[1]] $service_tag = undef,
@@ -55,7 +55,7 @@ define swift::service(
include swift::deps include swift::deps
include swift::params 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") fail("swift::service name: ${name} is not a valid swift_init_service_name")
} }

4
manifests/storage.pp
View File

@@ -26,12 +26,12 @@
# #
class swift::storage( class swift::storage(
$storage_local_net_ip, $storage_local_net_ip,
$rsync_use_xinetd = $::swift::params::xinetd_available, $rsync_use_xinetd = $swift::params::xinetd_available,
) inherits swift::params { ) inherits swift::params {
include swift::deps 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') fail('xinetd is not available in this distro')
} }

8
manifests/storage/account.pp
View File

@@ -24,14 +24,14 @@
# service_provider to "swiftinit". When enable is true the provider # service_provider to "swiftinit". When enable is true the provider
# will populate boot files that start swift using swift-init at boot. # will populate boot files that start swift using swift-init at boot.
# See README for more details. # See README for more details.
# Defaults to $::swift::params::service_provider. # Defaults to $swift::params::service_provider.
# #
class swift::storage::account( class swift::storage::account(
Boolean $manage_service = true, Boolean $manage_service = true,
Boolean $enabled = true, Boolean $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
String[1] $config_file_name = 'account-server.conf', 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 { ) inherits swift::params {
include swift::deps include swift::deps
@@ -41,7 +41,7 @@ class swift::storage::account(
enabled => $enabled, enabled => $enabled,
package_ensure => $package_ensure, package_ensure => $package_ensure,
config_file_name => $config_file_name, config_file_name => $config_file_name,
service_provider => $service_provider service_provider => $service_provider,
} }
if $manage_service { if $manage_service {
@@ -52,7 +52,7 @@ class swift::storage::account(
} }
swift::service { 'swift-account-reaper': 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, service_ensure => $service_ensure,
enabled => $enabled, enabled => $enabled,
config_file_name => $config_file_name, config_file_name => $config_file_name,

4
manifests/storage/all.pp
View File

@@ -174,7 +174,7 @@ class swift::storage::all(
$rsync_timeout = $facts['os_service_default'], $rsync_timeout = $facts['os_service_default'],
$rsync_bwlimit = $facts['os_service_default'], $rsync_bwlimit = $facts['os_service_default'],
$splice = false, $splice = false,
$rsync_use_xinetd = $::swift::params::xinetd_available, $rsync_use_xinetd = $swift::params::xinetd_available,
) inherits swift::params { ) inherits swift::params {
include swift::deps 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") 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') fail('xinetd is not available in this distro')
} }

12
manifests/storage/container.pp
View File

@@ -29,7 +29,7 @@
# service_provider to "swiftinit". When enable is true the provider # service_provider to "swiftinit". When enable is true the provider
# will populate boot files that start swift using swift-init at boot. # will populate boot files that start swift using swift-init at boot.
# See README for more details. # See README for more details.
# Defaults to $::swift::params::service_provider. # Defaults to $swift::params::service_provider.
# #
class swift::storage::container( class swift::storage::container(
Boolean $manage_service = true, Boolean $manage_service = true,
@@ -37,7 +37,7 @@ class swift::storage::container(
$package_ensure = 'present', $package_ensure = 'present',
Array[String[1]] $allowed_sync_hosts = ['127.0.0.1'], Array[String[1]] $allowed_sync_hosts = ['127.0.0.1'],
String[1] $config_file_name = 'container-server.conf', 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 { ) inherits swift::params {
include swift::deps include swift::deps
@@ -47,7 +47,7 @@ class swift::storage::container(
enabled => $enabled, enabled => $enabled,
package_ensure => $package_ensure, package_ensure => $package_ensure,
config_file_name => $config_file_name, config_file_name => $config_file_name,
service_provider => $service_provider service_provider => $service_provider,
} }
if $manage_service { if $manage_service {
@@ -58,7 +58,7 @@ class swift::storage::container(
} }
swift::service { 'swift-container-updater': 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, service_ensure => $service_ensure,
enabled => $enabled, enabled => $enabled,
config_file_name => $config_file_name, config_file_name => $config_file_name,
@@ -67,7 +67,7 @@ class swift::storage::container(
} }
swift::service { 'swift-container-sync': 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, service_ensure => $service_ensure,
enabled => $enabled, enabled => $enabled,
config_file_name => $config_file_name, config_file_name => $config_file_name,
@@ -76,7 +76,7 @@ class swift::storage::container(
} }
swift::service { 'swift-container-sharder': 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, service_ensure => $service_ensure,
enabled => $enabled, enabled => $enabled,
config_file_name => $config_file_name, config_file_name => $config_file_name,

2
manifests/storage/cron/recon.pp
View File

@@ -51,7 +51,7 @@ class swift::storage::cron::recon(
$month = '*', $month = '*',
$weekday = '*', $weekday = '*',
$configfile = '/etc/swift/object-server.conf', $configfile = '/etc/swift/object-server.conf',
$user = $::swift::params::user $user = $swift::params::user
) inherits swift::params { ) inherits swift::params {
include swift::deps include swift::deps

8
manifests/storage/drive_audit.pp
View File

@@ -6,7 +6,7 @@
# #
# [*user*] # [*user*]
# (Optional) User with access to swift files. # (Optional) User with access to swift files.
# Defaults to $::swift::params::user. # Defaults to $swift::params::user.
# #
# [*minute*] # [*minute*]
# (Optional) Defaults to '1'. # (Optional) Defaults to '1'.
@@ -102,7 +102,7 @@
# #
class swift::storage::drive_audit( class swift::storage::drive_audit(
# cron options # cron options
$user = $::swift::params::user, $user = $swift::params::user,
$minute = 1, $minute = 1,
$hour = 0, $hour = 0,
$monthday = '*', $monthday = '*',
@@ -138,10 +138,10 @@ class swift::storage::drive_audit(
file { '/etc/swift/drive-audit.conf': file { '/etc/swift/drive-audit.conf':
ensure => 'file', ensure => 'file',
owner => 'root', owner => 'root',
group => $::swift::params::group, group => $swift::params::group,
mode => '0640', mode => '0640',
require => Anchor['swift::config::begin'], 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<||> File['/etc/swift/drive-audit.conf'] -> Swift_drive_audit_config<||>

20
manifests/storage/filter/backend_ratelimit.pp
View File

@@ -78,34 +78,34 @@ define swift::storage::filter::backend_ratelimit(
create_resources($config_type, { create_resources($config_type, {
'filter:backend_ratelimit/use' => { 'filter:backend_ratelimit/use' => {
'value' => 'egg:swift#backend_ratelimit' 'value' => 'egg:swift#backend_ratelimit',
}, },
'filter:backend_ratelimit/requests_per_device_per_second' => { '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' => { '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' => { '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' => { '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' => { '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' => { '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' => { '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' => { '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' => { 'filter:backend_ratelimit/requests_per_device_rate_buffer' => {
'value' => $requests_per_device_rate_buffer 'value' => $requests_per_device_rate_buffer,
} }
}) })

8
manifests/storage/generic.pp
View File

@@ -28,7 +28,7 @@
# service_provider to "swiftinit". When enable is true the provider # service_provider to "swiftinit". When enable is true the provider
# will populate boot files that start swift using swift-init at boot. # will populate boot files that start swift using swift-init at boot.
# See README for more details. # See README for more details.
# Defaults to $::swift::params::service_provider. # Defaults to $swift::params::service_provider.
# #
# == Dependencies # == Dependencies
# Requires Class[swift::storage] # Requires Class[swift::storage]
@@ -39,7 +39,7 @@ define swift::storage::generic(
Boolean $enabled = true, Boolean $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
String[1] $config_file_name = "${name}-server.conf", 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 include swift::deps
@@ -55,8 +55,8 @@ define swift::storage::generic(
file { "/etc/swift/${type}-server/": file { "/etc/swift/${type}-server/":
ensure => directory, ensure => directory,
owner => $::swift::params::user, owner => $swift::params::user,
group => $::swift::params::group, group => $swift::params::group,
require => Anchor['swift::config::begin'], require => Anchor['swift::config::begin'],
before => Anchor['swift::config::end'], before => Anchor['swift::config::end'],
} }

4
manifests/storage/mount.pp
View File

@@ -71,8 +71,8 @@ define swift::storage::mount(
before => Anchor['swift::config::end'], before => Anchor['swift::config::end'],
} }
$user = $::swift::params::user $user = $swift::params::user
$group = $::swift::params::group $group = $swift::params::group
exec { "fix_mount_permissions_${name}": exec { "fix_mount_permissions_${name}":
command => ['chown', '-R', "${user}:${group}", "${mnt_base_dir}/${name}"], command => ['chown', '-R', "${user}:${group}", "${mnt_base_dir}/${name}"],

8
manifests/storage/node.pp
View File

@@ -24,11 +24,11 @@
# #
# [*owner*] # [*owner*]
# (optional) Owner (uid) of rsync server. # (optional) Owner (uid) of rsync server.
# Defaults to $::swift::params::user. # Defaults to $swift::params::user.
# #
# [*group*] # [*group*]
# (optional) Group (gid) of rsync server. # (optional) Group (gid) of rsync server.
# Defaults to $::swift::params::group. # Defaults to $swift::params::group.
# #
# [*max_connections*] # [*max_connections*]
# (optional) maximum number of simultaneous connections allowed. # (optional) maximum number of simultaneous connections allowed.
@@ -58,8 +58,8 @@ define swift::storage::node(
storage_local_net_ip => $storage_local_net_ip, storage_local_net_ip => $storage_local_net_ip,
devices => $mnt_base_dir, devices => $mnt_base_dir,
max_connections => $max_connections, max_connections => $max_connections,
owner => pick($owner, $::swift::params::user), owner => pick($owner, $swift::params::user),
group => pick($group, $::swift::params::group), group => pick($group, $swift::params::group),
} }
swift::storage::server { "60${name}0": swift::storage::server { "60${name}0":

10
manifests/storage/object.pp
View File

@@ -24,14 +24,14 @@
# service_provider to "swiftinit". When enable is true the provider # service_provider to "swiftinit". When enable is true the provider
# will populate boot files that start swift using swift-init at boot. # will populate boot files that start swift using swift-init at boot.
# See README for more details. # See README for more details.
# Defaults to $::swift::params::service_provider. # Defaults to $swift::params::service_provider.
# #
class swift::storage::object( class swift::storage::object(
Boolean $manage_service = true, Boolean $manage_service = true,
Boolean $enabled = true, Boolean $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
String[1] $config_file_name = 'object-server.conf', 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 { ) inherits swift::params {
include swift::deps include swift::deps
@@ -41,7 +41,7 @@ class swift::storage::object(
enabled => $enabled, enabled => $enabled,
package_ensure => $package_ensure, package_ensure => $package_ensure,
config_file_name => $config_file_name, config_file_name => $config_file_name,
service_provider => $service_provider service_provider => $service_provider,
} }
if $manage_service { if $manage_service {
@@ -52,7 +52,7 @@ class swift::storage::object(
} }
swift::service { 'swift-object-updater': 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, service_ensure => $service_ensure,
enabled => $enabled, enabled => $enabled,
config_file_name => $config_file_name, config_file_name => $config_file_name,
@@ -61,7 +61,7 @@ class swift::storage::object(
} }
swift::service { 'swift-object-reconstructor': 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, service_ensure => $service_ensure,
enabled => $enabled, enabled => $enabled,
config_file_name => $config_file_name, config_file_name => $config_file_name,

24
manifests/storage/server.pp
View File

@@ -30,11 +30,11 @@
# #
# [*owner*] # [*owner*]
# (optional) Owner (uid) of rsync server. # (optional) Owner (uid) of rsync server.
# Defaults to $::swift::params::user. # Defaults to $swift::params::user.
# #
# [*group*] # [*group*]
# (optional) Group (gid) of rsync server. # (optional) Group (gid) of rsync server.
# Defaults to $::swift::params::group. # Defaults to $swift::params::group.
# #
# [*max_connections*] # [*max_connections*]
# (optional) maximum number of simultaneous connections allowed. # (optional) maximum number of simultaneous connections allowed.
@@ -99,7 +99,7 @@
# #
# [*user*] # [*user*]
# (optional) User to run as # (optional) User to run as
# Defaults to $::swift::params::user. # Defaults to $swift::params::user.
# #
# [*workers*] # [*workers*]
# (optional) Override the number of pre-forked workers that will accept # (optional) Override the number of pre-forked workers that will accept
@@ -366,7 +366,7 @@ define swift::storage::server(
include swift::deps include swift::deps
include swift::params 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 # Fail if ${type-server} isn't included in the pipeline
if $pipeline[-1] != "${type}-server" { if $pipeline[-1] != "${type}-server" {
@@ -386,8 +386,8 @@ define swift::storage::server(
rsync::server::module { "${type}_${device_name}": rsync::server::module { "${type}_${device_name}":
path => $devices, path => $devices,
lock_file => "/var/lock/${type}_${device_name}.lock", lock_file => "/var/lock/${type}_${device_name}.lock",
uid => pick($owner, $::swift::params::user), uid => pick($owner, $swift::params::user),
gid => pick($group, $::swift::params::group), gid => pick($group, $swift::params::group),
hosts_allow => $hosts_allow, hosts_allow => $hosts_allow,
hosts_deny => $hosts_deny, hosts_deny => $hosts_deny,
incoming_chmod => $incoming_chmod, incoming_chmod => $incoming_chmod,
@@ -401,8 +401,8 @@ define swift::storage::server(
rsync::server::module { $type: rsync::server::module { $type:
path => $devices, path => $devices,
lock_file => "/var/lock/${type}.lock", lock_file => "/var/lock/${type}.lock",
uid => pick($owner, $::swift::params::user), uid => pick($owner, $swift::params::user),
gid => pick($group, $::swift::params::group), gid => pick($group, $swift::params::group),
hosts_allow => $hosts_allow, hosts_allow => $hosts_allow,
hosts_deny => $hosts_deny, hosts_deny => $hosts_deny,
incoming_chmod => $incoming_chmod, incoming_chmod => $incoming_chmod,
@@ -426,7 +426,7 @@ define swift::storage::server(
file { $config_file_full_path: file { $config_file_full_path:
ensure => 'file', ensure => 'file',
owner => 'root', owner => 'root',
group => pick($group, $::swift::params::group), group => pick($group, $swift::params::group),
mode => '0640', mode => '0640',
before => $required_middlewares, before => $required_middlewares,
} }
@@ -531,7 +531,7 @@ define swift::storage::server(
'container': { 'container': {
$type_opts = { $type_opts = {
'DEFAULT/db_preallocation' => {'value' => $db_preallocation}, '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-server
# container-auditor # container-auditor
# container-replicator # container-replicator
@@ -577,10 +577,10 @@ define swift::storage::server(
file { '/etc/swift/container-sync-realms.conf': file { '/etc/swift/container-sync-realms.conf':
ensure => 'file', ensure => 'file',
owner => 'root', owner => 'root',
group => pick($group, $::swift::params::group), group => pick($group, $swift::params::group),
mode => '0640', mode => '0640',
require => Anchor['swift::config::begin'], 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<||> File['/etc/swift/container-sync-realms.conf'] -> Swift_container_sync_realms_config<||>
} }