Andrew Bogott has submitted this change and it was merged.
Change subject: Tools: Remove lint
......................................................................
Tools: Remove lint
This leaves a few spots where puppet-lint complains about lines with
more than 80 characters, but changing those just for the sake of it
would be cumbersome and needs to be addressed by a proper refactoring.
Change-Id: Iac4fa7cedcb17a01fe99099c0305dc24c2c5017e
---
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/dev_environ.pp
M modules/toollabs/manifests/exec_environ.pp
M modules/toollabs/manifests/execnode.pp
M modules/toollabs/manifests/gridnode.pp
M modules/toollabs/manifests/hba.pp
M modules/toollabs/manifests/infrastructure.pp
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/mailrelay.pp
M modules/toollabs/manifests/master.pp
M modules/toollabs/manifests/proxy.pp
M modules/toollabs/manifests/redis.pp
M modules/toollabs/manifests/shadow.pp
M modules/toollabs/manifests/submit.pp
M modules/toollabs/manifests/webnode.pp
15 files changed, 65 insertions(+), 65 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/bastion.pp
b/modules/toollabs/manifests/bastion.pp
index 89be6c2..834e4b7 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -33,15 +33,15 @@
mode => '0755',
owner => 'root',
group => 'root',
- source =>
"puppet:///modules/toollabs/40-${instanceproject}-bastion-banner",
+ source =>
"puppet:///modules/toollabs/40-${::instanceproject}-bastion-banner",
}
- file { "${store}/submithost-${::fqdn}":
+ file { "${toollabs::store}/submithost-${::fqdn}":
ensure => file,
owner => 'root',
group => 'root',
mode => '0444',
- require => File[$store],
+ require => File[$toollabs::store],
content => "${::ipaddress}\n",
}
diff --git a/modules/toollabs/manifests/dev_environ.pp
b/modules/toollabs/manifests/dev_environ.pp
index caa72fd..8e6991f 100644
--- a/modules/toollabs/manifests/dev_environ.pp
+++ b/modules/toollabs/manifests/dev_environ.pp
@@ -77,15 +77,15 @@
# pastebinit configuration for http://tools.wmflabs.org/paste/.
file { '/etc/pastebin.d':
- require => Package['pastebinit'],
ensure => 'directory',
+ require => Package['pastebinit'],
owner => 'root',
group => 'root',
mode => '0555',
}
file { '/etc/pastebin.d/tools.conf':
- require => File['/etc/pastebin.d'],
ensure => 'file',
+ require => File['/etc/pastebin.d'],
source => 'puppet:///modules/toollabs/pastebinit.conf',
owner => 'root',
group => 'root',
diff --git a/modules/toollabs/manifests/exec_environ.pp
b/modules/toollabs/manifests/exec_environ.pp
index 973d227..09c34bb 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -184,10 +184,10 @@
'php5-sqlite',
'php5-xsl',
- # Fonts
- 'fonts-ipafont-gothic', # for vCat tool (Japanese fonts)
- 'fonts-unfonts-core', # for vCat tool (Korean fonts)
- 'ttf-indic-fonts', # for vCat tool (fonts for many Indic
languages)
+ # Fonts for vCat tool.
+ 'fonts-ipafont-gothic', # Japanese fonts.
+ 'fonts-unfonts-core', # Korean fonts.
+ 'ttf-indic-fonts', # Many Indic languages.
# tcl packages
'mysqltcl',
diff --git a/modules/toollabs/manifests/execnode.pp
b/modules/toollabs/manifests/execnode.pp
index 14b03c4..19ac4af 100644
--- a/modules/toollabs/manifests/execnode.pp
+++ b/modules/toollabs/manifests/execnode.pp
@@ -20,7 +20,7 @@
}
class { 'toollabs::hba':
- store => $store,
+ store => $toollabs::store,
}
file { '/etc/update-motd.d/40-exechost-banner':
@@ -28,18 +28,17 @@
mode => '0755',
owner => 'root',
group => 'root',
- source =>
"puppet:///modules/toollabs/40-${instanceproject}-exechost-banner",
+ source =>
"puppet:///modules/toollabs/40-${::instanceproject}-exechost-banner",
}
- file { "${store}/execnode-${::fqdn}":
+ file { "${toollabs::store}/execnode-${::fqdn}":
ensure => file,
owner => 'root',
group => 'root',
mode => '0444',
- require => File[$store],
+ require => File[$toollabs::store],
content => "${::ipaddress}\n",
}
# TODO: grid node setup
}
-
diff --git a/modules/toollabs/manifests/gridnode.pp
b/modules/toollabs/manifests/gridnode.pp
index 4d09dac..0f4da43 100644
--- a/modules/toollabs/manifests/gridnode.pp
+++ b/modules/toollabs/manifests/gridnode.pp
@@ -10,9 +10,9 @@
#
class toollabs::gridnode inherits toollabs {
- file { "${sysdir}/gridengine":
+ file { "${toollabs::sysdir}/gridengine":
ensure => directory,
- require => File[$sysdir],
+ require => File[$toollabs::sysdir],
}
file { '/var/lib/gridengine':
@@ -22,12 +22,12 @@
mount { '/var/lib/gridengine':
ensure => mounted,
atboot => False,
- device => "${sysdir}/gridengine",
+ device => "${toollabs::sysdir}/gridengine",
fstype => none,
options => 'rw,bind',
- require => File["${sysdir}/gridengine", '/var/lib/gridengine'],
+ require => File["${toollabs::sysdir}/gridengine",
+ '/var/lib/gridengine'],
before => Package['gridengine-common'],
}
}
-
diff --git a/modules/toollabs/manifests/hba.pp
b/modules/toollabs/manifests/hba.pp
index a2ff805..c044ab6 100644
--- a/modules/toollabs/manifests/hba.pp
+++ b/modules/toollabs/manifests/hba.pp
@@ -54,4 +54,3 @@
}
}
-
diff --git a/modules/toollabs/manifests/infrastructure.pp
b/modules/toollabs/manifests/infrastructure.pp
index 6147bb3..a13bfda 100644
--- a/modules/toollabs/manifests/infrastructure.pp
+++ b/modules/toollabs/manifests/infrastructure.pp
@@ -19,7 +19,7 @@
mode => '0755',
owner => 'root',
group => 'root',
- source =>
"puppet:///modules/toollabs/40-${instanceproject}-infrastructure-banner",
+ source =>
"puppet:///modules/toollabs/40-${::instanceproject}-infrastructure-banner",
}
# Infrastructure instances are limited to an (arbitrarily picked) local
@@ -29,4 +29,3 @@
content => "-:ALL EXCEPT (tools.admin) root:ALL\n",
}
}
-
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index dff9e80..09e9b0e 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -16,8 +16,8 @@
include labs_lvm
$sysdir = '/data/project/.system'
- $store = "$sysdir/store"
- $repo = "$sysdir/deb"
+ $store = "${sysdir}/store"
+ $repo = "${sysdir}/deb"
#
# The $store is an incredibly horrid workaround the fact that we cannot
@@ -33,7 +33,7 @@
ensure => directory,
owner => 'root',
group => 'tools.admin',
- mode => '02775',
+ mode => '2775',
require => Mount['/data/project'],
}
@@ -55,7 +55,7 @@
}
exec { 'make_known_hosts':
- command => "/bin/cat $store/hostkey-* >/etc/ssh/ssh_known_hosts~",
+ command => "/bin/cat ${store}/hostkey-* >/etc/ssh/ssh_known_hosts~",
require => File[$store],
}
@@ -103,7 +103,7 @@
file { '/etc/apt/sources.list.d/local.list':
ensure => file,
- content => "deb [ arch=amd64 trusted=yes ] file:${repo}/ amd64/\ndeb
[arch=all trusted=yes ] file:${repo}/ all/\n",
+ content => "deb [arch=amd64 trusted=yes] file:${repo}/ amd64/\ndeb
[arch=all trusted=yes] file:${repo}/ all/\n",
mode => '0444',
owner => 'root',
group => 'root',
@@ -126,7 +126,7 @@
File <| title == '/etc/exim4/exim4.conf' |> {
content => undef,
- source => [ "${store}/mail-relay",
'puppet:///modules/toollabs/exim4-norelay.conf' ],
+ source => ["${store}/mail-relay",
'puppet:///modules/toollabs/exim4-norelay.conf'],
notify => Service['exim4'],
}
@@ -139,6 +139,6 @@
# Don't collect MountStats, because we have no clear use for it atm.
# Should be removed in a day or two
diamond::collector { 'MountStats':
- ensure => absent
+ ensure => absent,
}
}
diff --git a/modules/toollabs/manifests/mailrelay.pp
b/modules/toollabs/manifests/mailrelay.pp
index 23b46c1..cd12a4e 100644
--- a/modules/toollabs/manifests/mailrelay.pp
+++ b/modules/toollabs/manifests/mailrelay.pp
@@ -10,7 +10,8 @@
#
# Sample Usage:
#
-class toollabs::mailrelay($maildomain, $gridmaster) inherits toollabs {
+class toollabs::mailrelay($maildomain,
+ $gridmaster) inherits toollabs {
include toollabs::infrastructure,
toollabs::gridnode
@@ -18,12 +19,12 @@
gridmaster => $gridmaster,
}
- file { "${store}/mail-relay":
+ file { "${toollabs::store}/mail-relay":
ensure => file,
owner => 'root',
group => 'root',
mode => '0444',
- require => File[$store],
+ require => File[$toollabs::store],
content => template('toollabs/mail-relay.erb'),
}
@@ -47,7 +48,8 @@
source => undef,
content => template('toollabs/exim4.conf.erb'),
notify => Service['exim4'],
- require => File['/usr/local/sbin/localuser',
'/usr/local/sbin/maintainers'],
+ require => File['/usr/local/sbin/localuser',
+ '/usr/local/sbin/maintainers'],
}
File <| title == '/etc/default/exim4' |> {
diff --git a/modules/toollabs/manifests/master.pp
b/modules/toollabs/manifests/master.pp
index 584786c..cd702ab 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -24,22 +24,21 @@
# any singleton instance.
#
- file { $repo:
+ file { $toollabs::repo:
ensure => directory,
owner => 'tools.admin',
group => 'tools.admin',
mode => '0755',
- require => File[$sysdir],
+ require => File[$toollabs::sysdir],
}
- file { "${repo}/update-repo.sh":
+ file { "${toollabs::repo}/update-repo.sh":
ensure => file,
owner => 'tools.admin',
group => 'tools.admin',
mode => '0550',
- require => File[$repo],
+ require => File[$toollabs::repo],
source => 'puppet:///modules/toollabs/update-repo.sh',
}
}
-
diff --git a/modules/toollabs/manifests/proxy.pp
b/modules/toollabs/manifests/proxy.pp
index 05fb3e5..edee338 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -19,7 +19,8 @@
group => 'root',
mode => '0555',
source => 'puppet:///modules/toollabs/proxylistener.py',
- require => Package['python-redis'] # Is provided by the dynamicproxy
class
+ # Is provided by the dynamicproxy class.
+ require => Package['python-redis']
}
file { '/etc/init/proxylistener.conf':
diff --git a/modules/toollabs/manifests/redis.pp
b/modules/toollabs/manifests/redis.pp
index 64621d7..e8c8e8c 100644
--- a/modules/toollabs/manifests/redis.pp
+++ b/modules/toollabs/manifests/redis.pp
@@ -25,16 +25,16 @@
# Disable the following commands, to try to limit people from
# Trampling on each others' keys
rename_commands => {
- "CONFIG" => "",
- "FLUSHALL" => "",
- "FLUSHDB" => "",
- "KEYS" => "",
- "SHUTDOWN" => "",
- "SLAVEOF" => "",
- "CLIENT" => "",
- "RANDOMKEY" => "",
- "DEBUG" => "",
- "MONITOR" => ""
+ 'CONFIG' => '',
+ 'FLUSHALL' => '',
+ 'FLUSHDB' => '',
+ 'KEYS' => '',
+ 'SHUTDOWN' => '',
+ 'SLAVEOF' => '',
+ 'CLIENT' => '',
+ 'RANDOMKEY' => '',
+ 'DEBUG' => '',
+ 'MONITOR' => ''
},
monitor => true
}
diff --git a/modules/toollabs/manifests/shadow.pp
b/modules/toollabs/manifests/shadow.pp
index 02fd116..8479020 100644
--- a/modules/toollabs/manifests/shadow.pp
+++ b/modules/toollabs/manifests/shadow.pp
@@ -18,7 +18,6 @@
class { 'gridengine::shadow_master':
gridmaster => $gridmaster,
- sgeroot => "$sysdir/gridengine",
+ sgeroot => "${toollabs::sysdir}/gridengine",
}
}
-
diff --git a/modules/toollabs/manifests/submit.pp
b/modules/toollabs/manifests/submit.pp
index 6e55519..2583db0 100644
--- a/modules/toollabs/manifests/submit.pp
+++ b/modules/toollabs/manifests/submit.pp
@@ -28,7 +28,7 @@
}
class { 'toollabs::hba':
- store => $store,
+ store => $toollabs::store,
}
file { '/etc/update-motd.d/40-bastion-banner':
@@ -36,15 +36,15 @@
mode => '0755',
owner => 'root',
group => 'root',
- source =>
"puppet:///modules/toollabs/40-${instanceproject}-submithost-banner",
+ source =>
"puppet:///modules/toollabs/40-${::instanceproject}-submithost-banner",
}
- file { "${store}/submithost-${::fqdn}":
+ file { "${toollabs::store}/submithost-${::fqdn}":
ensure => file,
owner => 'root',
group => 'root',
mode => '0444',
- require => File[$store],
+ require => File[$toollabs::store],
content => "${::ipaddress}\n",
}
@@ -69,9 +69,7 @@
}
service { 'bigbrother':
- require => File[ '/usr/local/sbin/bigbrother',
'/etc/init/bigbrother.conf' ],
ensure => running,
+ require => File['/usr/local/sbin/bigbrother',
'/etc/init/bigbrother.conf'],
}
-
}
-
diff --git a/modules/toollabs/manifests/webnode.pp
b/modules/toollabs/manifests/webnode.pp
index b9eb8ea..92d0602 100644
--- a/modules/toollabs/manifests/webnode.pp
+++ b/modules/toollabs/manifests/webnode.pp
@@ -23,12 +23,12 @@
gridmaster => $gridmaster,
}
- file { "${store}/execnode-${::fqdn}":
+ file { "${toollabs::store}/execnode-${::fqdn}":
ensure => file,
owner => 'root',
group => 'root',
mode => '0444',
- require => File[$store],
+ require => File[$toollabs::store],
content => "${::ipaddress}\n",
}
@@ -48,7 +48,8 @@
exec { 'make-shosts':
command => '/usr/local/sbin/project-make-shosts
>/etc/ssh/shosts.equiv~',
- require => File['/usr/local/sbin/project-make-shosts', $store],
+ require => File['/usr/local/sbin/project-make-shosts',
+ $toollabs::store],
}
file { '/etc/ssh/shosts.equiv':
@@ -70,7 +71,8 @@
exec { 'make-access':
command => '/usr/local/sbin/project-make-access
>/etc/security/access.conf~',
- require => File['/usr/local/sbin/project-make-access', $store],
+ require => File['/usr/local/sbin/project-make-access',
+ $toollabs::store],
}
File <| title == '/etc/security/access.conf' |> {
@@ -89,7 +91,7 @@
'lighttpd',
'lighttpd-mod-magnet', #Bug 68614
]:
- ensure => latest,
+ ensure => latest,
require => File['/var/run/lighttpd'],
}
@@ -97,7 +99,7 @@
ensure => directory,
owner => 'www-data',
group => 'www-data',
- mode => '01777',
+ mode => '1777',
}
}
tomcat: {
@@ -108,6 +110,9 @@
ensure => latest,
before => File['/usr/local/bin/tomcat-starter'],
}
+ }
+ default: {
+ fail("toollabs::webnode: Unknown type ${type}")
}
}
@@ -151,4 +156,3 @@
source => 'puppet:///modules/toollabs/portgranter.conf',
}
}
-
--
To view, visit https://gerrit.wikimedia.org/r/124001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac4fa7cedcb17a01fe99099c0305dc24c2c5017e
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
