jenkins-bot has submitted this change and it was merged.
Change subject: Add a Rakefile for running puppet-lint against repo
......................................................................
Add a Rakefile for running puppet-lint against repo
Change-Id: Ib94785eec3d0428733a55a0cdcc15e4acb153cba
---
A Rakefile
M puppet/modules/mediawiki/manifests/extension.pp
M puppet/modules/mysql/manifests/init.pp
M puppet/modules/redis/manifests/init.pp
4 files changed, 14 insertions(+), 8 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..f24a955
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,10 @@
+# Rakefile
+# --------
+# Run 'rake lint' to lint Puppet files. Requires 'puppet-lint'.
+#
+require 'puppet-lint/tasks/puppet-lint'
+
+PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_2sp_soft_tabs')
+PuppetLint.configuration.send('disable_hard_tabs')
+PuppetLint.configuration.ignore_paths = ['puppet/manifests/roles.pp']
diff --git a/puppet/modules/mediawiki/manifests/extension.pp
b/puppet/modules/mediawiki/manifests/extension.pp
index 54aff67..4cb62e8 100644
--- a/puppet/modules/mediawiki/manifests/extension.pp
+++ b/puppet/modules/mediawiki/manifests/extension.pp
@@ -82,11 +82,7 @@
) {
include mediawiki
- $extension_dir = $directory ? {
- undef => "${mediawiki::dir}/extensions/${extension}",
- default => $directory,
- }
-
+ $extension_dir = "${mediawiki::dir}/extensions/${extension}"
@git::clone { "mediawiki/extensions/${extension}":
directory => $extension_dir,
}
diff --git a/puppet/modules/mysql/manifests/init.pp
b/puppet/modules/mysql/manifests/init.pp
index 75a0c3f..1f77913 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -6,7 +6,7 @@
# === Parameters
#
# [*root_password*]
-# Password for the root MySQL account.
+# Password for the root MySQL account (default: 'vagrant').
#
# [*default_db_name*]
# If defined, the 'mysql' command-line client will be configured to
@@ -20,7 +20,7 @@
# }
#
class mysql(
- $root_password,
+ $root_password = 'vagrant',
$default_db_name = undef,
) {
diff --git a/puppet/modules/redis/manifests/init.pp
b/puppet/modules/redis/manifests/init.pp
index 4511c94..513436e 100644
--- a/puppet/modules/redis/manifests/init.pp
+++ b/puppet/modules/redis/manifests/init.pp
@@ -81,7 +81,7 @@
ensure => running,
provider => init,
subscribe => File['/etc/redis/redis.conf'],
- require => [
+ require => [
File['/etc/redis/redis.conf', '/srv/redis'],
Package['redis-server'],
],
--
To view, visit https://gerrit.wikimedia.org/r/63455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib94785eec3d0428733a55a0cdcc15e4acb153cba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
