jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401671 )
Change subject: puppet-lint: Fix errors introduced while tests were broken
......................................................................
puppet-lint: Fix errors introduced while tests were broken
Our puppet-lint checks have not been running for an unknown amount of
time. We did pretty well actually, but a few issues have slipped through
that need to be cleaned up.
Change-Id: Ic90dceb7c333cc0b1f2f9cba90dbfe9bd5fbf15b
---
M .puppet-lint.rc
M Rakefile
M puppet/modules/role/manifests/ores.pp
M puppet/modules/systemd/manifests/service.pp
M puppet/modules/thumbor/manifests/init.pp
5 files changed, 11 insertions(+), 10 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index d6db438..f02862f 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1,8 +1,8 @@
# Long lines are common in Exec and various config blocks.
-# Using templates or lint:ignore:80chars comments to work around that is
+# Using templates or lint:ignore:140chars comments to work around that is
# painful, so just ignore the automated check and rely on manual checks to see
# that this is not abused.
---no-80chars-check
+--no-140chars-check
# Be strict.
--fail-on-warnings
diff --git a/Rakefile b/Rakefile
index b057e5a..99565b2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -29,6 +29,7 @@
config.ignore_paths = IO.readlines(gitmodules).grep(/\s*path\s*=\s*(\S+)/) {
"#{Regexp.last_match(1)}/**/*.pp"
}
+ config.ignore_paths += ['puppet/modules/stdlib/**/*.pp']
config.ignore_paths += ['tmp/**/*.pp']
config.log_format = '%{path}:%{line} %{KIND}: %{message}'
end
diff --git a/puppet/modules/role/manifests/ores.pp
b/puppet/modules/role/manifests/ores.pp
index 8651e0e..338a8a2 100644
--- a/puppet/modules/role/manifests/ores.pp
+++ b/puppet/modules/role/manifests/ores.pp
@@ -35,6 +35,5 @@
# when ORES is installed locally via role::ores_service.
# This is pretty horrible but seems to be the only way of avoiding cycles.
Systemd::Service<| title == 'ores-wsgi' or title == 'ores-celery' |>
- ->
- Mediawiki::Maintenance['check ORES model versions']
+ -> Mediawiki::Maintenance['check ORES model versions']
}
diff --git a/puppet/modules/systemd/manifests/service.pp
b/puppet/modules/systemd/manifests/service.pp
index cda8297..c5a6ba6 100644
--- a/puppet/modules/systemd/manifests/service.pp
+++ b/puppet/modules/systemd/manifests/service.pp
@@ -66,15 +66,16 @@
}
}
+ $unit_content = $epp_template ? {
+ true => epp($unit_template, $template_variables),
+ default => template($unit_template),
+ }
file { $unit_path:
ensure => $ensure,
owner => 'root',
group => 'root',
mode => '0444',
- content => $epp_template ? {
- true => epp($unit_template, $template_variables),
- default => template($unit_template),
- },
+ content => $unit_content,
}
exec { "systemd reload for ${name}":
diff --git a/puppet/modules/thumbor/manifests/init.pp
b/puppet/modules/thumbor/manifests/init.pp
index 16d84a2..6edac72 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -37,8 +37,8 @@
}
package { 'python-thumbor-wikimedia':
- ensure => 'present',
- notify => Exec['stop-and-disable-default-thumbor-service'],
+ ensure => 'present',
+ notify => Exec['stop-and-disable-default-thumbor-service'],
}
exec { 'stop-and-disable-default-thumbor-service':
--
To view, visit https://gerrit.wikimedia.org/r/401671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic90dceb7c333cc0b1f2f9cba90dbfe9bd5fbf15b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
