Andrew Bogott has submitted this change and it was merged.
Change subject: various role classes - indentation fixes
......................................................................
various role classes - indentation fixes
about 75 x 'indentation of => is not properly aligned'
puppet-lint 1.1.0
Bug: T93645
Change-Id: I6ea05a3f0e0074896b42ceb1c0c632eedcf54661
---
M manifests/role/labmon.pp
M manifests/role/nova.pp
M manifests/role/ntp.pp
M manifests/role/osm.pp
M manifests/role/parsoid.pp
M manifests/role/postgres.pp
M manifests/role/redisdb.pp
M manifests/role/releases.pp
M manifests/role/requesttracker.pp
M manifests/role/torrus.pp
M manifests/role/wikimania_scholarships.pp
M manifests/role/zuul.pp
12 files changed, 79 insertions(+), 79 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labmon.pp b/manifests/role/labmon.pp
index b77ccb6..a7cb46c 100644
--- a/manifests/role/labmon.pp
+++ b/manifests/role/labmon.pp
@@ -6,10 +6,10 @@
class { 'role::graphite::labmon': }
file { '/var/lib/carbon':
- ensure => link,
- target => '/srv/carbon',
- owner => '_graphite',
- group => '_graphite',
+ ensure => link,
+ target => '/srv/carbon',
+ owner => '_graphite',
+ group => '_graphite',
require => Class['role::graphite::labmon']
}
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 2063e4f..37ff0b4 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -218,8 +218,8 @@
}
class { 'openstack::openstack-manager':
- novaconfig => $novaconfig,
- certificate => $certificate,
+ novaconfig => $novaconfig,
+ certificate => $certificate,
}
include ::nutcracker::monitoring
diff --git a/manifests/role/ntp.pp b/manifests/role/ntp.pp
index 1254cc3..ce64456 100644
--- a/manifests/role/ntp.pp
+++ b/manifests/role/ntp.pp
@@ -102,9 +102,9 @@
system::role { 'ntp': description => 'NTP server' }
ntp::daemon { 'server':
- servers => $peer_upstreams[$::fqdn],
- peers => delete($wmf_all_peers, $::fqdn),
- time_acl => $our_networks_acl,
+ servers => $peer_upstreams[$::fqdn],
+ peers => delete($wmf_all_peers, $::fqdn),
+ time_acl => $our_networks_acl,
query_acl => $neon_acl,
}
@@ -130,8 +130,8 @@
}
ntp::daemon { 'client':
- servers => $client_upstreams[$::site],
- query_acl => $neon_acl,
+ servers => $client_upstreams[$::site],
+ query_acl => $neon_acl,
servers_opt => $s_opt,
}
diff --git a/manifests/role/osm.pp b/manifests/role/osm.pp
index 1d1aa40..278508e 100644
--- a/manifests/role/osm.pp
+++ b/manifests/role/osm.pp
@@ -7,10 +7,10 @@
file { '/etc/postgresql/9.1/main/tuning.conf':
ensure => 'present',
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///files/osm/tuning.conf',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///files/osm/tuning.conf',
}
sysctl::parameters { 'postgres_shmem':
@@ -52,8 +52,8 @@
postgresql::spatialdb { 'gis': }
# Import planet.osm
osm::planet_import { 'gis':
- input_pbf_file => '/srv/labsdb/planet-latest-osm.pbf',
- require => Postgresql::Spatialdb['gis']
+ input_pbf_file => '/srv/labsdb/planet-latest-osm.pbf',
+ require => Postgresql::Spatialdb['gis']
}
osm::planet_sync { 'gis':
period => 'day',
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 2a72280..3fbaaed 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -53,10 +53,10 @@
}
user { 'parsoid':
- gid => 'parsoid',
- home => '/var/lib/parsoid',
- managehome => true,
- system => true,
+ gid => 'parsoid',
+ home => '/var/lib/parsoid',
+ managehome => true,
+ system => true,
}
file { '/var/lib/parsoid/deploy':
@@ -65,11 +65,11 @@
}
file { '/etc/init/parsoid.conf':
- ensure => present,
- owner => root,
- group => root,
- mode => '0444',
- source => 'puppet:///files/misc/parsoid.upstart',
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => '0444',
+ source => 'puppet:///files/misc/parsoid.upstart',
}
file { '/var/log/parsoid':
ensure => directory,
@@ -104,12 +104,12 @@
}
cron { 'parsoid-hourly-logrot':
- ensure => present,
- command => '/usr/sbin/logrotate /etc/logrotate.d/parsoid',
- user => 'root',
- hour => '*',
- minute => '12',
- require => File['/etc/logrotate.d/parsoid'],
+ ensure => present,
+ command => '/usr/sbin/logrotate /etc/logrotate.d/parsoid',
+ user => 'root',
+ hour => '*',
+ minute => '12',
+ require => File['/etc/logrotate.d/parsoid'],
}
service { 'parsoid':
@@ -130,9 +130,9 @@
}
# until logging is handled differently, rt 6851
nrpe::monitor_service { 'parsoid_disk_space':
- description => 'parsoid disk space',
- nrpe_command => '/usr/lib/nagios/plugins/check_disk -w 40% -c 3% -l
-e',
- critical => true,
+ description => 'parsoid disk space',
+ nrpe_command => '/usr/lib/nagios/plugins/check_disk -w 40% -c 3% -l
-e',
+ critical => true,
}
}
@@ -185,11 +185,11 @@
target => '/lib/init/upstart-job',
}
file { '/etc/init/parsoid.conf':
- ensure => present,
- owner => root,
- group => root,
- mode => '0444',
- source => 'puppet:///files/misc/parsoid.upstart',
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => '0444',
+ source => 'puppet:///files/misc/parsoid.upstart',
}
$parsoid_log_file = '/data/project/parsoid/parsoid.log'
diff --git a/manifests/role/postgres.pp b/manifests/role/postgres.pp
index 62e1280..5dbbae6 100644
--- a/manifests/role/postgres.pp
+++ b/manifests/role/postgres.pp
@@ -7,10 +7,10 @@
file { '/etc/postgresql/9.1/main/tuning.conf':
ensure => 'present',
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///files/postgres/tuning.conf',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///files/postgres/tuning.conf',
}
sysctl::parameters { 'postgres_shmem':
diff --git a/manifests/role/redisdb.pp b/manifests/role/redisdb.pp
index 25061eb..cd0299c 100644
--- a/manifests/role/redisdb.pp
+++ b/manifests/role/redisdb.pp
@@ -24,9 +24,9 @@
include passwords::redis
ferm::service { 'redis-server':
- proto => 'tcp',
- port => '6379',
- srange => '$ALL_NETWORKS',
+ proto => 'tcp',
+ port => '6379',
+ srange => '$ALL_NETWORKS',
}
class { '::redis':
diff --git a/manifests/role/releases.pp b/manifests/role/releases.pp
index 922640b..391fa08 100644
--- a/manifests/role/releases.pp
+++ b/manifests/role/releases.pp
@@ -2,13 +2,13 @@
system::role { 'releases': description => 'Releases webserver' }
monitoring::service { 'http':
- description => 'HTTP',
- check_command => 'check_http',
+ description => 'HTTP',
+ check_command => 'check_http',
}
class { '::releases':
- sitename => 'releases.wikimedia.org',
- docroot => 'releases',
+ sitename => 'releases.wikimedia.org',
+ docroot => 'releases',
}
class { '::releases::reprepro': }
diff --git a/manifests/role/requesttracker.pp b/manifests/role/requesttracker.pp
index 48036ae..ab70b06 100644
--- a/manifests/role/requesttracker.pp
+++ b/manifests/role/requesttracker.pp
@@ -9,21 +9,21 @@
$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
class { '::requesttracker':
- apache_site => 'rt.wikimedia.org',
- dbhost => 'm1-master.eqiad.wmnet',
- dbport => '',
- dbuser => $passwords::misc::rt::rt_mysql_user,
- dbpass => $passwords::misc::rt::rt_mysql_pass,
+ apache_site => 'rt.wikimedia.org',
+ dbhost => 'm1-master.eqiad.wmnet',
+ dbport => '',
+ dbuser => $passwords::misc::rt::rt_mysql_user,
+ dbpass => $passwords::misc::rt::rt_mysql_pass,
}
class { 'exim::roled':
- local_domains => [ '+system_domains', '+rt_domains' ],
- enable_mail_relay => false,
- enable_external_mail => false,
- smart_route_list => $::mail_smarthost,
- enable_mailman => false,
- rt_relay => true,
- enable_spamassassin => false,
+ local_domains => [ '+system_domains', '+rt_domains' ],
+ enable_mail_relay => false,
+ enable_external_mail => false,
+ smart_route_list => $::mail_smarthost,
+ enable_mailman => false,
+ rt_relay => true,
+ enable_spamassassin => false,
}
# allow RT to receive mail from mail smarthosts
@@ -62,10 +62,10 @@
$datadir = '/srv/mysql'
class { '::requesttracker':
- apache_site => $::fqdn,
- dbuser => $passwords::misc::rt::rt_mysql_user,
- dbpass => $passwords::misc::rt::rt_mysql_pass,
- datadir => $datadir,
+ apache_site => $::fqdn,
+ dbuser => $passwords::misc::rt::rt_mysql_user,
+ dbpass => $passwords::misc::rt::rt_mysql_pass,
+ datadir => $datadir,
}
class { 'mysql::server':
diff --git a/manifests/role/torrus.pp b/manifests/role/torrus.pp
index 57fc942..28eecf8 100644
--- a/manifests/role/torrus.pp
+++ b/manifests/role/torrus.pp
@@ -58,7 +58,7 @@
}
monitoring::service { 'torrus-http':
- description => 'torrus.wikimedia.org HTTP',
+ description => 'torrus.wikimedia.org HTTP',
check_command =>
'check_http_url_for_string!torrus.wikimedia.org!/torrus!\'Torrus Top:
Wikimedia\'',
}
}
diff --git a/manifests/role/wikimania_scholarships.pp
b/manifests/role/wikimania_scholarships.pp
index 7a55526..07754b4 100644
--- a/manifests/role/wikimania_scholarships.pp
+++ b/manifests/role/wikimania_scholarships.pp
@@ -18,8 +18,8 @@
}
ferm::service { 'scholarships_http':
- proto => 'tcp',
- port => '80',
+ proto => 'tcp',
+ port => '80',
}
}
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index 312d113..e7df092 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -132,17 +132,17 @@
class { '::zuul::merger':
# Shared settings
- gearman_server =>
$role::zuul::configuration::shared[$::realm]['gearman_server'],
- gerrit_server =>
$role::zuul::configuration::shared[$::realm]['gerrit_server'],
- gerrit_user =>
$role::zuul::configuration::shared[$::realm]['gerrit_user'],
- url_pattern =>
$role::zuul::configuration::shared[$::realm]['url_pattern'],
- status_url =>
$role::zuul::configuration::shared[$::realm]['status_url'],
+ gearman_server =>
$role::zuul::configuration::shared[$::realm]['gearman_server'],
+ gerrit_server =>
$role::zuul::configuration::shared[$::realm]['gerrit_server'],
+ gerrit_user =>
$role::zuul::configuration::shared[$::realm]['gerrit_user'],
+ url_pattern =>
$role::zuul::configuration::shared[$::realm]['url_pattern'],
+ status_url =>
$role::zuul::configuration::shared[$::realm]['status_url'],
# Merger related
- git_dir =>
$role::zuul::configuration::merger[$::realm]['git_dir'],
- git_email =>
$role::zuul::configuration::merger[$::realm]['git_email'],
- git_name =>
$role::zuul::configuration::merger[$::realm]['git_name'],
- zuul_url =>
$role::zuul::configuration::merger[$::realm]['zuul_url'],
+ git_dir =>
$role::zuul::configuration::merger[$::realm]['git_dir'],
+ git_email =>
$role::zuul::configuration::merger[$::realm]['git_email'],
+ git_name =>
$role::zuul::configuration::merger[$::realm]['git_name'],
+ zuul_url =>
$role::zuul::configuration::merger[$::realm]['zuul_url'],
}
# Serves Zuul git repositories
--
To view, visit https://gerrit.wikimedia.org/r/200110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ea05a3f0e0074896b42ceb1c0c632eedcf54661
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: John F. Lewis <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
