Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188206
Change subject: fix puppet compiler warnings
......................................................................
fix puppet compiler warnings
Change-Id: I78c5e66da95930b80c5465ec062ba6ecc817c2df
---
M manifests/role/ci.pp
M manifests/role/ocg.pp
M manifests/role/swift.pp
M manifests/role/tendril.pp
M manifests/role/xenon.pp
5 files changed, 28 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/188206/1
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 521483d..7033cd9 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -21,7 +21,7 @@
# .gitconfig file required for rare git write operations
git::userconfig { '.gitconfig for jenkins user':
- homedir => '/var/lib/jenkins',
+ homedir => '/var/lib/jenkins',
settings => {
'user' => {
'name' => 'Wikimedia Jenkins Bot',
@@ -32,7 +32,7 @@
'packedGitLimit' => '2G',
}, # end of [core] section
}, # end of settings
- require => User['jenkins'],
+ require => User['jenkins'],
}
# Templates for Jenkins plugin Email-ext. The templates are hosted in
@@ -158,14 +158,14 @@
# .gitconfig file required for rare git write operations
git::userconfig { '.gitconfig for jenkins-slave user':
- homedir => '/var/lib/jenkins-slave',
+ homedir => '/var/lib/jenkins-slave',
settings => {
'user' => {
'name' => 'Wikimedia Jenkins Bot',
'email' => "jenkins-slave@${::fqdn}",
}, # end of [user] section
}, # end of settings
- require => User['jenkins-slave'],
+ require => User['jenkins-slave'],
}
# Maven requires a webproxy on production slaves
@@ -201,9 +201,9 @@
}
file { '/home/npmtravis/.ssh':
- ensure => directory,
- owner => 'npmtravis',
- mode => '0500',
+ ensure => directory,
+ owner => 'npmtravis',
+ mode => '0500',
require => User['npmtravis'],
}
@@ -278,10 +278,10 @@
# only LDAP and is not created by puppet
# bug 61144
file { '/mnt/home':
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0755',
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
require => $slash_mnt_require,
}
@@ -322,7 +322,7 @@
'email' =>
"jenkins-deploy@${::instancename}.${::site}.wmflabs",
}, # end of [user] section
}, # end of settings
- require => File['/mnt/home/jenkins-deploy'],
+ require => File['/mnt/home/jenkins-deploy'],
}
# The slaves on labs use the `jenkins-deploy` user which is already
@@ -481,9 +481,9 @@
}
rsync::server::module { 'doc':
- path => '/srv/doc',
- read_only => 'no',
- require => [
+ path => '/srv/doc',
+ read_only => 'no',
+ require => [
File['/srv/doc'],
Class['role::labs::lvm::srv'],
],
diff --git a/manifests/role/ocg.pp b/manifests/role/ocg.pp
index 8dfc03f..d117875 100644
--- a/manifests/role/ocg.pp
+++ b/manifests/role/ocg.pp
@@ -81,7 +81,7 @@
}
class { 'redis':
- maxmemory => '500Mb',
- password => $passwords::redis::ocg_test_password,
+ maxmemory => '500Mb',
+ password => $passwords::redis::ocg_test_password,
}
}
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index bcfae3a..6b8425f 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -362,10 +362,10 @@
include ::swift::storage::monitoring
}
file { '/usr/local/bin/swift-labs-ring':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/swift/swift-labs-ring',
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///files/swift/swift-labs-ring',
}
}
diff --git a/manifests/role/tendril.pp b/manifests/role/tendril.pp
index 51572c6..a6eeeed 100644
--- a/manifests/role/tendril.pp
+++ b/manifests/role/tendril.pp
@@ -9,16 +9,16 @@
$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
class { '::tendril':
- site_name => 'tendril.wikimedia.org',
- docroot => '/srv/tendril/web',
- ldap_binddn => 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org',
- ldap_authurl => 'ldaps://ldap-eqiad.wikimedia.org
ldap-codfw.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn',
- ldap_groups => [
+ site_name => 'tendril.wikimedia.org',
+ docroot => '/srv/tendril/web',
+ ldap_binddn => 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org',
+ ldap_authurl => 'ldaps://ldap-eqiad.wikimedia.org
ldap-codfw.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn',
+ ldap_groups => [
'cn=ops,ou=groups,dc=wikimedia,dc=org',
'cn=nda,ou=groups,dc=wikimedia,dc=org',
'cn=wmf,ou=groups,dc=wikimedia,dc=org',
],
- auth_name => 'WMF Labs (use wiki login name not shell)',
+ auth_name => 'WMF Labs (use wiki login name not shell)',
}
}
diff --git a/manifests/role/xenon.pp b/manifests/role/xenon.pp
index a062973..11fbbf7 100644
--- a/manifests/role/xenon.pp
+++ b/manifests/role/xenon.pp
@@ -23,7 +23,7 @@
source => 'puppet:///files/xenon/theme',
owner => 'www-data',
group => 'www-data',
- mode => 0755,
+ mode => '0755',
recurse => true,
before => Apache::Site['xenon'],
}
--
To view, visit https://gerrit.wikimedia.org/r/188206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78c5e66da95930b80c5465ec062ba6ecc817c2df
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
