Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195607
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/monitoring/graphite.pp
M modules/swift_new/manifests/params.pp
M modules/swift_new/manifests/proxy.pp
M modules/swift_new/manifests/stats/accounts.pp
M modules/swift_new/manifests/stats/dispersion.pp
M modules/swift_new/manifests/stats/stats_account.pp
M modules/swift_new/manifests/storage.pp
8 files changed, 28 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/07/195607/1
diff --git a/modules/swift_new/manifests/container_sync.pp
b/modules/swift_new/manifests/container_sync.pp
index f9622f6..37a2dc9 100644
--- a/modules/swift_new/manifests/container_sync.pp
+++ b/modules/swift_new/manifests/container_sync.pp
@@ -1,9 +1,9 @@
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,
+ ensure => 'present',
mode => '0440',
owner => 'swift',
group => 'swift',
diff --git a/modules/swift_new/manifests/monitoring/graphite.pp
b/modules/swift_new/manifests/monitoring/graphite.pp
index 1c875c8..b684f8d 100644
--- a/modules/swift_new/manifests/monitoring/graphite.pp
+++ b/modules/swift_new/manifests/monitoring/graphite.pp
@@ -5,19 +5,19 @@
description => "swift ${swift_cluster} object availability",
metric =>
"swift.${swift_cluster}.dispersion.object.pct_found.value",
from => '1hours',
- warning => 95,
- critical => 90,
+ warning => '95',
+ critical => '90',
under => true,
- nagios_critical => false
+ nagios_critical => false,
}
monitoring::graphite_threshold {
"swift_${swift_cluster_dispersion_container}":
description => "swift ${swift_cluster} container availability",
metric =>
"swift.${swift_cluster}.dispersion.container.pct_found.value",
from => '30min',
- warning => 92,
- critical => 88,
+ warning => '92',
+ critical => '88',
under => true,
- nagios_critical => false
+ nagios_critical => false,
}
}
diff --git a/modules/swift_new/manifests/params.pp
b/modules/swift_new/manifests/params.pp
index c41c6f7..6239ce6 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..3f3db98 100644
--- a/modules/swift_new/manifests/proxy.pp
+++ b/modules/swift_new/manifests/proxy.pp
@@ -40,14 +40,14 @@
}
file { '/etc/logrotate.d/swift-proxy':
- ensure => present,
+ ensure => 'present',
source => 'puppet:///modules/swift_new/swift-proxy.logrotate.conf',
mode => '0444',
}
rsyslog::conf { 'swift-proxy':
source => 'puppet:///modules/swift_new/swift-proxy.rsyslog.conf',
- priority => 30,
+ priority => '30',
}
file { '/usr/local/lib/python2.7/dist-packages/wmf/':
diff --git a/modules/swift_new/manifests/stats/accounts.pp
b/modules/swift_new/manifests/stats/accounts.pp
index e06d721..1c9288d 100644
--- a/modules/swift_new/manifests/stats/accounts.pp
+++ b/modules/swift_new/manifests/stats/accounts.pp
@@ -13,7 +13,7 @@
# report account stats to graphite
file { '/usr/local/bin/swift-account-stats':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0555',
diff --git a/modules/swift_new/manifests/stats/dispersion.pp
b/modules/swift_new/manifests/stats/dispersion.pp
index c7a5cc7..189ee69 100644
--- a/modules/swift_new/manifests/stats/dispersion.pp
+++ b/modules/swift_new/manifests/stats/dispersion.pp
@@ -10,7 +10,7 @@
]
file { '/usr/local/bin/swift-dispersion-stats':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0555',
@@ -20,7 +20,7 @@
# XXX swift-dispersion-populate is not ran/initialized
cron { 'swift-dispersion-stats':
- ensure => present,
+ ensure => 'present',
command => "/usr/local/bin/swift-dispersion-stats --prefix
${statsd_prefix} --statsd-host ${statsd_host} 1>/dev/null",
user => 'root',
hour => '*',
diff --git a/modules/swift_new/manifests/stats/stats_account.pp
b/modules/swift_new/manifests/stats/stats_account.pp
index b8c994b..8b6a3bc 100644
--- a/modules/swift_new/manifests/stats/stats_account.pp
+++ b/modules/swift_new/manifests/stats/stats_account.pp
@@ -21,7 +21,7 @@
}
cron { "swift-account-stats_${user}":
- ensure => present,
+ ensure => 'present',
command => ". ${account_file} && /usr/local/bin/swift-account-stats
--prefix ${account_statsd_prefix} --statsd-host ${statsd_host} 1>/dev/null",
user => 'root',
hour => '*',
diff --git a/modules/swift_new/manifests/storage.pp
b/modules/swift_new/manifests/storage.pp
index 0c7e696..0bfebf7 100644
--- a/modules/swift_new/manifests/storage.pp
+++ b/modules/swift_new/manifests/storage.pp
@@ -15,22 +15,23 @@
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',
--
To view, visit https://gerrit.wikimedia.org/r/195607
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd9b640f98cb4a71d85344ac0ef2586b5eac8904
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
