[MediaWiki-commits] [Gerrit] swift_new: lint and resource quoting - change (operations/puppet)
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
[MediaWiki-commits] [Gerrit] swift_new: lint and resource quoting - change (operations/puppet)
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 =
