Andrew Bogott has submitted this change and it was merged.
Change subject: base: lint fixes
......................................................................
base: lint fixes
Change-Id: Ibc7a03213b5e86b37602d79690d87b1d7a935b2c
---
M modules/base/manifests/init.pp
M modules/base/manifests/monitoring/host.pp
M modules/base/manifests/puppet.pp
M modules/base/manifests/sysctl.pp
4 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index d014e12..f5dc33a 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -129,9 +129,9 @@
}
ferm::conf { 'main':
- ensure => $ensure,
- prio => '00',
- source =>
'puppet:///modules/base/firewall/main-input-default-drop.conf',
+ ensure => $ensure,
+ prio => '00',
+ source =>
'puppet:///modules/base/firewall/main-input-default-drop.conf',
}
ferm::rule { 'bastion-ssh':
@@ -183,8 +183,8 @@
}
class { 'base::puppet':
- server => $::realm ? {
- 'labs' => $::site ? {
+ server => $::realm ? {
+ 'labs' => $::site ? {
'eqiad' => 'virt1000.wikimedia.org',
},
default => 'puppet',
@@ -214,8 +214,8 @@
# as the monitor host's contact group.
class { 'base::monitoring::host':
contact_group => $::nagios_contact_group ? {
- undef => 'admins',
- default => $::nagios_contact_group,
+ undef => 'admins',
+ default => $::nagios_contact_group,
}
}
diff --git a/modules/base/manifests/monitoring/host.pp
b/modules/base/manifests/monitoring/host.pp
index 7ee7a68..30d95c1 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -42,12 +42,12 @@
}
service { 'mpt-statusd':
- ensure => stopped,
- enable => false,
- hasstatus => false,
- stop => '/usr/bin/pkill -9 -f mpt-statusd',
- require => Package['mpt-status'],
- subscribe => File['/etc/default/mpt-statusd'],
+ ensure => stopped,
+ enable => false,
+ hasstatus => false,
+ stop => '/usr/bin/pkill -9 -f mpt-statusd',
+ require => Package['mpt-status'],
+ subscribe => File['/etc/default/mpt-statusd'],
}
file { '/usr/local/bin/check-raid.py':
diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index 0b13732..7183e62 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -57,7 +57,7 @@
# Compile /etc/puppet/puppet.conf from individual files in
/etc/puppet/puppet.conf.d
exec { 'compile puppet.conf':
path => '/usr/bin:/bin',
- command => "cat /etc/puppet/puppet.conf.d/??-*.conf >
/etc/puppet/puppet.conf",
+ command => 'cat /etc/puppet/puppet.conf.d/??-*.conf >
/etc/puppet/puppet.conf',
refreshonly => true,
}
diff --git a/modules/base/manifests/sysctl.pp b/modules/base/manifests/sysctl.pp
index d168a32..3932137 100644
--- a/modules/base/manifests/sysctl.pp
+++ b/modules/base/manifests/sysctl.pp
@@ -6,7 +6,7 @@
#
# We also set them ourselves so we can purge /etc/sysctl.d.
sysctl::parameters { 'ubuntu defaults':
- values => {
+ values => {
# 10-console-messages.conf
'kernel.printk' => [ 4, 4, 1, 7 ],
@@ -35,7 +35,7 @@
}
sysctl::parameters { 'wikimedia base':
- values => {
+ values => {
# Increase TCP max buffer size
'net.core.rmem_max' => 16777216,
'net.core.wmem_max' => 16777216,
--
To view, visit https://gerrit.wikimedia.org/r/170477
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc7a03213b5e86b37602d79690d87b1d7a935b2c
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
