Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Fixed spacing and alignment
......................................................................
Fixed spacing and alignment
This fixes lint 'two-space soft tabs not used'.
Change-Id: I78aae2a826ba663711964faaea9040247cd0022e
---
M manifests/role/coredb.pp
M manifests/role/elasticsearch.pp
M manifests/role/grafana.pp
M manifests/role/logstash.pp
M manifests/role/phabricator.pp
M manifests/role/pybal_config.pp
M manifests/role/wikimetrics.pp
M manifests/site.pp
M modules/bacula/manifests/client/job.pp
M modules/diamond/manifests/init.pp
M modules/install-server/manifests/dhcp-server.pp
M modules/labs_lvm/manifests/volume.pp
M modules/postgresql/manifests/spatialdb.pp
M modules/postgresql/manifests/user.pp
M modules/puppet_compiler/manifests/packages.pp
15 files changed, 65 insertions(+), 63 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 33b8a13..d6b148d 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -58,7 +58,7 @@
},
'x1' => {
'hosts' => {
- 'eqiad' => [ 'db1029', 'db1031' ] },
+ 'eqiad' => [ 'db1029', 'db1031' ] },
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1029' },
'snapshot' => [ 'db1031' ],
@@ -66,7 +66,7 @@
},
'm1' => {
'hosts' => {
- 'eqiad' => ['db1001', 'db1016'] },
+ 'eqiad' => ['db1001', 'db1016'] },
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1001' },
'snapshot' => ['db1016' ],
diff --git a/manifests/role/elasticsearch.pp b/manifests/role/elasticsearch.pp
index 92e1f86..41b4c0a 100644
--- a/manifests/role/elasticsearch.pp
+++ b/manifests/role/elasticsearch.pp
@@ -91,7 +91,7 @@
}
if ($rack == 'Unknown') {
- fail("Don't know rack for $::host")
+ fail("Don't know rack for $::host")
}
$row = regsubst($rack, '^(.).$', '\1' )
diff --git a/manifests/role/grafana.pp b/manifests/role/grafana.pp
index 32f758e..6a51a5f 100644
--- a/manifests/role/grafana.pp
+++ b/manifests/role/grafana.pp
@@ -18,10 +18,10 @@
render_method => 'GET',
},
elasticsearch => {
- type => 'elasticsearch',
- url => "//grafana.${domain_suffix}",
- index => 'grafana-dashboards',
- grafanaDB => true,
+ type => 'elasticsearch',
+ url => "//grafana.${domain_suffix}",
+ index => 'grafana-dashboards',
+ grafanaDB => true,
},
},
},
diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index 0539da2..d467244 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -49,11 +49,11 @@
include ::redis::ganglia
class { '::logstash':
- heap_memory_mb => 128,
- # TODO: the multiline filter that is used in several places in the
- # current configuration isn't thread safe and can cause crashes or
- # garbled output when used with more than one thread worker.
- filter_workers => 1,
+ heap_memory_mb => 128,
+ # TODO: the multiline filter that is used in several places in the
+ # current configuration isn't thread safe and can cause crashes or
+ # garbled output when used with more than one thread worker.
+ filter_workers => 1,
}
logstash::input::udp2log { 'mediawiki':
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 3994505..026172f 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -32,9 +32,9 @@
'mysql.host' => 'm3-master.eqiad.wmnet',
'storage.default-namespace' => 'phlegal',
'phpmailer.smtp-host' =>
- inline_template('<%= @mail_smarthost.join(";") %>'),
+ inline_template('<%= @mail_smarthost.join(";") %>'),
'metamta.default-address' =>
- 'no-re...@legalpad.wikimedia.org',
+ 'no-re...@legalpad.wikimedia.org',
'metamta.domain' => 'legalpad.wikimedia.org',
},
}
diff --git a/manifests/role/pybal_config.pp b/manifests/role/pybal_config.pp
index f1a5247..19c715e 100644
--- a/manifests/role/pybal_config.pp
+++ b/manifests/role/pybal_config.pp
@@ -3,11 +3,11 @@
class { '::pybal::web':
vhostnames => [
- 'config-master.eqiad.wmnet',
- 'config-master.codfw.wmnet',
- 'config-master.esams.wmnet',
- 'config-master.ulsfo.wmnet',
- 'config-master.wikimedia.org',
- ]
+ 'config-master.eqiad.wmnet',
+ 'config-master.codfw.wmnet',
+ 'config-master.esams.wmnet',
+ 'config-master.ulsfo.wmnet',
+ 'config-master.wikimedia.org',
+ ]
}
}
diff --git a/manifests/role/wikimetrics.pp b/manifests/role/wikimetrics.pp
index 7ba1e13..5371771 100644
--- a/manifests/role/wikimetrics.pp
+++ b/manifests/role/wikimetrics.pp
@@ -34,7 +34,7 @@
# Otherwise, backup gets turned off.
#
class role::wikimetrics {
- # wikimetrics does not yet run via puppet in production
+ # wikimetrics does not yet run via puppet in production
if $::realm == 'production' {
fail('Cannot include role::wikimetrics in production (yet).')
}
diff --git a/manifests/site.pp b/manifests/site.pp
index c42a68d..ddd843d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -413,9 +413,9 @@
include admin
interface::add_ip6_mapped { 'main': }
rsyslog::conf { 'remote_logstash':
- content => "*.* @logstash1002.eqiad.wmnet:10514",
- priority => 32,
- }
+ content => "*.* @logstash1002.eqiad.wmnet:10514",
+ priority => 32,
+ }
}
node 'beryllium.wikimedia.org' {
@@ -581,9 +581,9 @@
include admin
interface::add_ip6_mapped { 'main': }
rsyslog::conf { 'remote_logstash':
- content => "*.* @logstash1002.eqiad.wmnet:10514",
- priority => 32,
- }
+ content => "*.* @logstash1002.eqiad.wmnet:10514",
+ priority => 32,
+ }
}
node /^cp30(0[3-9]|10|1[5-8])\.esams\.(wikimedia\.org|wmnet)$/ {
diff --git a/modules/bacula/manifests/client/job.pp
b/modules/bacula/manifests/client/job.pp
index 698ad35..4663249 100644
--- a/modules/bacula/manifests/client/job.pp
+++ b/modules/bacula/manifests/client/job.pp
@@ -25,9 +25,9 @@
# }
#
define bacula::client::job(
- $fileset,
- $jobdefaults,
- $extras=undef) {
+ $fileset,
+ $jobdefaults,
+ $extras=undef) {
$director = $::bacula::client::director
diff --git a/modules/diamond/manifests/init.pp
b/modules/diamond/manifests/init.pp
index 3926fcd..42e43c0 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -58,8 +58,9 @@
$path_prefix = 'servers',
$keep_logs_for = '5',
$service = running,
- $settings = { host => 'localhost',
- port => '8125',
+ $settings = {
+ host => 'localhost',
+ port => '8125',
},
) {
if os_version('debian >= jessie || ubuntu >= precise') {
diff --git a/modules/install-server/manifests/dhcp-server.pp
b/modules/install-server/manifests/dhcp-server.pp
index b1fbac8..64daaa6 100644
--- a/modules/install-server/manifests/dhcp-server.pp
+++ b/modules/install-server/manifests/dhcp-server.pp
@@ -38,9 +38,10 @@
service { $service_name:
ensure => running,
- require => [ Package[$package_name],
- File[$confdir]
- ],
+ require => [
+ Package[$package_name],
+ File[$confdir]
+ ],
subscribe => File[$confdir],
}
}
diff --git a/modules/labs_lvm/manifests/volume.pp
b/modules/labs_lvm/manifests/volume.pp
index 7b4cc4a..89d0a0a 100644
--- a/modules/labs_lvm/manifests/volume.pp
+++ b/modules/labs_lvm/manifests/volume.pp
@@ -42,9 +42,9 @@
unless => "/bin/mountpoint -q '$mountat'",
logoutput => 'on_failure',
require => [
- File['/usr/local/sbin/make-instance-vol'],
- Exec['create-volume-group']
- ],
+ File['/usr/local/sbin/make-instance-vol'],
+ Exec['create-volume-group']
+ ],
command => "/usr/local/sbin/make-instance-vol '$volname' '$size'
'$fstype' $mkfs_opt",
}
@@ -62,9 +62,9 @@
options => $options,
fstype => $fstype,
require => [
- Exec["create-vd-$volname"],
- File[$mountat],
- ],
+ Exec["create-vd-$volname"],
+ File[$mountat],
+ ],
}
labs_lvm::extend { $mountat:
diff --git a/modules/postgresql/manifests/spatialdb.pp
b/modules/postgresql/manifests/spatialdb.pp
index 9000b04..a06ae15 100644
--- a/modules/postgresql/manifests/spatialdb.pp
+++ b/modules/postgresql/manifests/spatialdb.pp
@@ -17,7 +17,7 @@
define postgresql::spatialdb(
$ensure = 'present',
$pg_version = '9.1',
- ) {
+ ) {
# Check if our db exists and store it
$db_exists = "/usr/bin/psql --tuples-only -c \'SELECT datname FROM
pg_catalog.pg_database;\' | /bin/grep \'^ ${name}\'"
diff --git a/modules/postgresql/manifests/user.pp
b/modules/postgresql/manifests/user.pp
index 59dd3f6..c48f89f 100644
--- a/modules/postgresql/manifests/user.pp
+++ b/modules/postgresql/manifests/user.pp
@@ -25,16 +25,16 @@
# Based upon https://github.com/uggedal/puppet-module-postgresql
#
define postgresql::user(
- $user,
- $password,
- $database = 'template1',
- $type = 'host',
- $method = 'md5',
- $cidr = '127.0.0.1/32',
- $pgversion = '9.1',
- $attrs = '',
- $ensure = 'present'
- ) {
+ $user,
+ $password,
+ $database = 'template1',
+ $type = 'host',
+ $method = 'md5',
+ $cidr = '127.0.0.1/32',
+ $pgversion = '9.1',
+ $attrs = '',
+ $ensure = 'present'
+ ) {
# Check if our user exists and store it
$userexists = "/usr/bin/psql --tuples-only -c \'SELECT rolname FROM
pg_catalog.pg_roles;\' | /bin/grep \'^ ${user}\'"
diff --git a/modules/puppet_compiler/manifests/packages.pp
b/modules/puppet_compiler/manifests/packages.pp
index 09344dd..56a6088 100644
--- a/modules/puppet_compiler/manifests/packages.pp
+++ b/modules/puppet_compiler/manifests/packages.pp
@@ -1,16 +1,16 @@
class puppet_compiler::packages($ensure = $puppet_compiler::ensure) {
include stdlib
$list = [
- 'curl',
- 'python-dev',
- 'rubygems',
- 'ruby-bundler',
- 'ruby1.8-dev',
- 'mysql-server',
- 'mysql-client',
- 'ruby-mysql',
- 'ruby-bcrypt',
- 'nginx'
- ]
+ 'curl',
+ 'python-dev',
+ 'rubygems',
+ 'ruby-bundler',
+ 'ruby1.8-dev',
+ 'mysql-server',
+ 'mysql-client',
+ 'ruby-mysql',
+ 'ruby-bcrypt',
+ 'nginx'
+ ]
ensure_packages([$list])
}
--
To view, visit https://gerrit.wikimedia.org/r/181404
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78aae2a826ba663711964faaea9040247cd0022e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry <kartik.mis...@gmail.com>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
