Filippo Giunchedi has submitted this change and it was merged. Change subject: swift_new: lint and resource quoting ......................................................................
swift_new: lint and resource quoting bug: T91908 Change-Id: Icd9b640f98cb4a71d85344ac0ef2586b5eac8904 --- M modules/swift_new/manifests/container_sync.pp M modules/swift_new/manifests/init.pp M modules/swift_new/manifests/monitoring/graphite.pp M modules/swift_new/manifests/mount_filesystem.pp M modules/swift_new/manifests/params.pp M modules/swift_new/manifests/proxy.pp M modules/swift_new/manifests/ring.pp M modules/swift_new/manifests/stats/accounts.pp M modules/swift_new/manifests/storage.pp 9 files changed, 36 insertions(+), 35 deletions(-) Approvals: Andrew Bogott: Looks good to me, but someone else must approve Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/modules/swift_new/manifests/container_sync.pp b/modules/swift_new/manifests/container_sync.pp index f9622f6..e090099 100644 --- a/modules/swift_new/manifests/container_sync.pp +++ b/modules/swift_new/manifests/container_sync.pp @@ -1,6 +1,6 @@ class swift_new::container_sync ( - $replication_accounts = $::swift_new::params::replication_accounts, - $replication_keys = $::swift_new::params::replication_keys, + $replication_accounts = $::swift_new::params::replication_accounts, + $replication_keys = $::swift_new::params::replication_keys, ) { file { '/etc/swift/container-sync-realms.conf': ensure => present, diff --git a/modules/swift_new/manifests/init.pp b/modules/swift_new/manifests/init.pp index 121dbe3..19ba756 100644 --- a/modules/swift_new/manifests/init.pp +++ b/modules/swift_new/manifests/init.pp @@ -39,7 +39,7 @@ 'python-swiftclient', 'parted', ]: - ensure => 'present', + ensure => present, } require_package('python-statsd') @@ -51,7 +51,7 @@ } file { '/etc/swift': - ensure => 'directory', + ensure => directory, require => Package['swift'], recurse => true, } @@ -63,7 +63,7 @@ } file { '/var/cache/swift': - ensure => 'directory', + ensure => directory, require => Package['swift'], mode => '0755', } diff --git a/modules/swift_new/manifests/monitoring/graphite.pp b/modules/swift_new/manifests/monitoring/graphite.pp index 1c875c8..2b7460c 100644 --- a/modules/swift_new/manifests/monitoring/graphite.pp +++ b/modules/swift_new/manifests/monitoring/graphite.pp @@ -8,7 +8,7 @@ warning => 95, critical => 90, under => true, - nagios_critical => false + nagios_critical => false, } monitoring::graphite_threshold { "swift_${swift_cluster_dispersion_container}": @@ -18,6 +18,6 @@ warning => 92, critical => 88, under => true, - nagios_critical => false + nagios_critical => false, } } diff --git a/modules/swift_new/manifests/mount_filesystem.pp b/modules/swift_new/manifests/mount_filesystem.pp index 66235f0..c169e35 100644 --- a/modules/swift_new/manifests/mount_filesystem.pp +++ b/modules/swift_new/manifests/mount_filesystem.pp @@ -6,7 +6,7 @@ $mount_point = "${mount_base}/${dev_suffix}" file { "mountpoint-${mount_point}": - ensure => 'directory', + ensure => directory, path => $mount_point, owner => 'swift', group => 'swift', @@ -19,7 +19,7 @@ # We don't want puppet to keep the FS mounted, otherwise # it would conflict with swift-drive-auditor trying to keep FS # unmounted. - ensure => 'present', + ensure => present, device => "LABEL=swift-${dev_suffix}", name => $mount_point, fstype => 'xfs', diff --git a/modules/swift_new/manifests/params.pp b/modules/swift_new/manifests/params.pp index c41c6f7..e8f1ef5 100644 --- a/modules/swift_new/manifests/params.pp +++ b/modules/swift_new/manifests/params.pp @@ -1,10 +1,10 @@ class swift_new::params ( - $swift_cluster = undef, - $accounts = {}, - $account_keys = {}, - $replication_accounts = {}, - $replication_keys = {}, - $graphite_host = 'graphite-in.eqiad.wmnet', + $swift_cluster = undef, + $accounts = {}, + $account_keys = {}, + $replication_accounts = {}, + $replication_keys = {}, + $graphite_host = 'graphite-in.eqiad.wmnet', ) { # Noop class } diff --git a/modules/swift_new/manifests/proxy.pp b/modules/swift_new/manifests/proxy.pp index ff91efe..eee4136 100644 --- a/modules/swift_new/manifests/proxy.pp +++ b/modules/swift_new/manifests/proxy.pp @@ -18,7 +18,7 @@ 'swift-proxy', 'python-swauth', ]: - ensure => 'present', + ensure => present, } file { '/etc/swift/proxy-server.conf': diff --git a/modules/swift_new/manifests/ring.pp b/modules/swift_new/manifests/ring.pp index 67dec1a..c56e129 100644 --- a/modules/swift_new/manifests/ring.pp +++ b/modules/swift_new/manifests/ring.pp @@ -3,32 +3,32 @@ $swift_cluster = $swift_new::params::swift_cluster, ) { file { '/etc/swift/account.builder': - ensure => 'present', + ensure => present, source => "puppet:///volatile/swift/${swift_cluster}/account.builder", } file { '/etc/swift/account.ring.gz': - ensure => 'present', + ensure => present, source => "puppet:///volatile/swift/${swift_cluster}/account.ring.gz", } file { '/etc/swift/container.builder': - ensure => 'present', + ensure => present, source => "puppet:///volatile/swift/${swift_cluster}/container.builder", } file { '/etc/swift/container.ring.gz': - ensure => 'present', + ensure => present, source => "puppet:///volatile/swift/${swift_cluster}/container.ring.gz", } file { '/etc/swift/object.builder': - ensure => 'present', + ensure => present, source => "puppet:///volatile/swift/${swift_cluster}/object.builder", } file { '/etc/swift/object.ring.gz': - ensure => 'present', + ensure => present, source => "puppet:///volatile/swift/${swift_cluster}/object.ring.gz", } } diff --git a/modules/swift_new/manifests/stats/accounts.pp b/modules/swift_new/manifests/stats/accounts.pp index e06d721..e0f6cde 100644 --- a/modules/swift_new/manifests/stats/accounts.pp +++ b/modules/swift_new/manifests/stats/accounts.pp @@ -1,8 +1,8 @@ class swift_new::stats::accounts( $swift_cluster = $::swift_new::params::swift_cluster, - $accounts = $::swift_new::params::accounts, - $credentials = $::swift_new::params::account_keys, - $statsd_host = 'statsd.eqiad.wmnet', + $accounts = $::swift_new::params::accounts, + $credentials = $::swift_new::params::account_keys, + $statsd_host = 'statsd.eqiad.wmnet', $statsd_prefix = "swift.${::swift_new::params::swift_cluster}.stats", ) { $required_packages = [ diff --git a/modules/swift_new/manifests/storage.pp b/modules/swift_new/manifests/storage.pp index 0c7e696..3ea48a7 100644 --- a/modules/swift_new/manifests/storage.pp +++ b/modules/swift_new/manifests/storage.pp @@ -8,29 +8,30 @@ 'swift-container', 'swift-object', ]: - ensure => 'present', + ensure => present, } class { 'rsync::server': log_file => '/var/log/rsyncd.log', } - rsync::server::module { - 'account': + rsync::server::module { 'account': uid => 'swift', gid => 'swift', max_connections => '5', path => '/srv/swift-storage/', read_only => 'no', - lock_file => '/var/lock/account.lock'; - 'container': + lock_file => '/var/lock/account.lock', + } + rsync::server::module { 'container': uid => 'swift', gid => 'swift', max_connections => '5', path => '/srv/swift-storage/', read_only => 'no', - lock_file => '/var/lock/container.lock'; - 'object': + lock_file => '/var/lock/container.lock', + } + rsync::server::module { 'object': uid => 'swift', gid => 'swift', max_connections => '10', @@ -59,7 +60,7 @@ } file { '/srv/swift-storage': - ensure => 'directory', + ensure => directory, require => Package['swift'], owner => 'swift', group => 'swift', @@ -81,7 +82,7 @@ 'swift-object-replicator', 'swift-object-updater', ]: - ensure => 'running', + ensure => running, } @@ -105,7 +106,7 @@ source => 'puppet:///modules/swift_new/swift-drive-audit.conf', } cron { 'swift-drive-audit': - ensure => 'present', + ensure => present, command => '/usr/bin/swift-drive-audit /etc/swift/swift-drive-audit.conf', user => 'root', minute => '1', -- To view, visit https://gerrit.wikimedia.org/r/195607 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd9b640f98cb4a71d85344ac0ef2586b5eac8904 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya <mata...@foss.co.il> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits