Faidon Liambotis has submitted this change and it was merged.
Change subject: role/swift: fix a typo
......................................................................
role/swift: fix a typo
Fix err: Could not retrieve catalog from remote server: Error 400 on
SERVER: Duplicate parameter 'ensure' for on
File[/usr/local/bin/swift-ganglia-report-global-stats] at
/etc/puppet/manifests/role/swift.pp:78 on node ms-fe1001.eqiad.wmnet
While at it, order the parameters in the rest of the file and get rid of
semicolons.
Change-Id: If37c0d12f09baaf5ab547fe0af41c56a8d77fd39
---
M manifests/role/swift.pp
1 file changed, 13 insertions(+), 14 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 39934cd..8e08fe0 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -28,12 +28,12 @@
owner => 'root',
group => 'root',
mode => '0440',
- content =>
template("swift/swift-ganglia-report-global-stats.conf.erb");
+ content =>
template("swift/swift-ganglia-report-global-stats.conf.erb"),
}
cron { "swift-ganglia-report-global-stats":
+ ensure => present,
command =>
"/usr/local/bin/swift-ganglia-report-global-stats -C
/etc/swift-ganglia-report-global-stats.conf -u 'mw:thumb' -c pmtpa-prod",
- user => root,
- ensure => present;
+ user => root,
}
}
class proxy inherits role::swift::pmtpa-prod {
@@ -74,7 +74,6 @@
group => 'root',
mode => '0555',
source =>
"puppet:///files/swift/swift-ganglia-report-global-stats",
- ensure => present;
}
# config file to hold the password
$password =
$passwords::swift::eqiad-prod::rewrite_password
@@ -82,12 +81,12 @@
owner => 'root',
group => 'root',
mode => '0440',
- content =>
template("swift/swift-ganglia-report-global-stats.conf.erb");
+ content =>
template("swift/swift-ganglia-report-global-stats.conf.erb"),
}
cron { "swift-ganglia-report-global-stats":
+ ensure => present,
command =>
"/usr/local/bin/swift-ganglia-report-global-stats -C
/etc/swift-ganglia-report-global-stats.conf -u 'mw:media' -c eqiad-prod",
- user => root,
- ensure => present;
+ user => root,
}
}
class proxy inherits role::swift::eqiad-prod {
@@ -122,15 +121,15 @@
class ganglia_reporter inherits role::swift::pmtpa-labs {
# one host per cluster should report global stats
file {
"/usr/local/bin/swift-ganglia-report-global-stats":
+ ensure => present,
path =>
"/usr/local/bin/swift-ganglia-report-global-stats",
mode => 0555,
source =>
"puppet:///files/swift/swift-ganglia-report-global-stats",
- ensure => present;
}
cron { "swift-ganglia-report-global-stats":
+ ensure => present,
command =>
"/usr/local/bin/swift-ganglia-report-global-stats -u 'mw:thumbnail' -p
userpassword -c pmtpa-labs",
- user => root,
- ensure => present;
+ user => root,
}
}
class proxy inherits role::swift::pmtpa-labs {
@@ -159,10 +158,10 @@
class ganglia_reporter inherits role::swift::pmtpa-labsupgrade {
# one host per cluster should report global stats
file {
"/usr/local/bin/swift-ganglia-report-global-stats":
+ ensure => present,
path =>
"/usr/local/bin/swift-ganglia-report-global-stats",
mode => 0555,
source =>
"puppet:///files/swift/swift-ganglia-report-global-stats",
- ensure => present;
}
# config file to hold the password (which isn't secret
in labs)
$password = "userpassword"
@@ -170,12 +169,12 @@
mode => 0440,
owner => root,
group => root,
- content =>
template("swift/swift-ganglia-report-global-stats.conf.erb");
+ content =>
template("swift/swift-ganglia-report-global-stats.conf.erb"),
}
cron { "swift-ganglia-report-global-stats":
+ ensure => present,
command =>
"/usr/local/bin/swift-ganglia-report-global-stats -C
/etc/swift-ganglia-report-global-stats.conf -u 'mw:thumbnail' -c
pmtpa-labsupgrade",
- user => root,
- ensure => present;
+ user => root,
}
}
class proxy inherits role::swift::pmtpa-labsupgrade {
--
To view, visit https://gerrit.wikimedia.org/r/95639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If37c0d12f09baaf5ab547fe0af41c56a8d77fd39
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
