Alexandros Kosiaris has submitted this change and it was merged. Change subject: Fix indentation in various files ......................................................................
Fix indentation in various files Change-Id: Ib442c919c46f5ec0176de46e10f0d51a2aa94afe --- M manifests/role/cache.pp M modules/bacula/manifests/client/job.pp M modules/icinga/manifests/ircbot.pp M modules/mw-rc-irc/manifests/ircserver.pp M modules/osm/manifests/ganglia.pp M modules/squid3/manifests/init.pp M modules/tor/manifests/init.pp 7 files changed, 13 insertions(+), 14 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 1351708..297b9c2 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -467,7 +467,7 @@ require => Class['::varnishkafka'], } - # Generate an alert if too many delivery report errors + # Generate an alert if too many delivery report errors monitoring::ganglia { 'varnishkafka-drerr': description => 'Varnishkafka Delivery Errors', metric => 'kafka.varnishkafka.kafka_drerr.per_second', diff --git a/modules/bacula/manifests/client/job.pp b/modules/bacula/manifests/client/job.pp index 8543f2e..698ad35 100644 --- a/modules/bacula/manifests/client/job.pp +++ b/modules/bacula/manifests/client/job.pp @@ -25,10 +25,9 @@ # } # define bacula::client::job( - $fileset, - $jobdefaults, - $extras=undef) { - + $fileset, + $jobdefaults, + $extras=undef) { $director = $::bacula::client::director diff --git a/modules/icinga/manifests/ircbot.pp b/modules/icinga/manifests/ircbot.pp index 322372e..9da428b 100644 --- a/modules/icinga/manifests/ircbot.pp +++ b/modules/icinga/manifests/ircbot.pp @@ -16,7 +16,7 @@ ircecho_logs => $ircecho_logs, ircecho_nick => $ircecho_nick, ircecho_server => $ircecho_server, - } + } # bug 26784 - IRC bots process need nagios monitoring nrpe::monitor_service { 'ircecho': diff --git a/modules/mw-rc-irc/manifests/ircserver.pp b/modules/mw-rc-irc/manifests/ircserver.pp index 39746d1..1f073c0 100644 --- a/modules/mw-rc-irc/manifests/ircserver.pp +++ b/modules/mw-rc-irc/manifests/ircserver.pp @@ -28,7 +28,7 @@ source => 'puppet:///modules/mw-rc-irc/monitor/ircd_stats.py', settings => { method => 'Threaded', - }, + }, } monitoring::service { 'ircd': diff --git a/modules/osm/manifests/ganglia.pp b/modules/osm/manifests/ganglia.pp index 56c1aa8..c299367 100644 --- a/modules/osm/manifests/ganglia.pp +++ b/modules/osm/manifests/ganglia.pp @@ -2,9 +2,9 @@ # This installs a Ganglia plugin for osm # class osm::ganglia( - $state_path, - $refresh_rate = 15, - $ensure = 'present' + $state_path, + $refresh_rate = 15, + $ensure = 'present' ) { file { '/usr/lib/ganglia/python_modules/osm.py': ensure => $ensure, diff --git a/modules/squid3/manifests/init.pp b/modules/squid3/manifests/init.pp index bfa9633..32b70d7 100644 --- a/modules/squid3/manifests/init.pp +++ b/modules/squid3/manifests/init.pp @@ -15,9 +15,9 @@ class squid3( - $ensure = present, - $config_content = undef, - $config_source = undef, + $ensure = present, + $config_content = undef, + $config_source = undef, ) { validate_re($ensure, '^(present|absent)$') diff --git a/modules/tor/manifests/init.pp b/modules/tor/manifests/init.pp index 8eee6f1..e8d26a9 100644 --- a/modules/tor/manifests/init.pp +++ b/modules/tor/manifests/init.pp @@ -50,7 +50,7 @@ port => $tor_dirport, } - motd::script { 'tor_arm': + motd::script { 'tor_arm': ensure => present, content => "#!/bin/sh\necho '\nThis is a Tor relay. arm is a monitoring tool for it.\nusage: sudo -u debian-tor arm\nalso see: tail -f /var/log/tor/tor.log\n'", } -- To view, visit https://gerrit.wikimedia.org/r/181071 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib442c919c46f5ec0176de46e10f0d51a2aa94afe Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry <kartik.mis...@gmail.com> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits