BBlack has submitted this change and it was merged.
Change subject: varnish: lint fixes
......................................................................
varnish: lint fixes
"indentation of => is not properly aligned"
"double quoted string containing no variables"
fixes more puppet-lint warnings
for T93645
Change-Id: I86c85bb2ac239d7c379db2375f03f7fb0d97d2b5
---
M modules/varnish/manifests/common.pp
M modules/varnish/manifests/common/vcl.pp
M modules/varnish/manifests/instance.pp
M modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
M modules/varnish/manifests/zero_update.pp
5 files changed, 35 insertions(+), 33 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/manifests/common.pp
b/modules/varnish/manifests/common.pp
index d221210..83d5982 100644
--- a/modules/varnish/manifests/common.pp
+++ b/modules/varnish/manifests/common.pp
@@ -18,19 +18,19 @@
}
file { '/usr/share/varnish/reload-vcl':
- source => 'puppet:///modules/varnish/reload-vcl',
- owner => 'root',
- group => 'root',
- mode => '0555',
+ source => 'puppet:///modules/varnish/reload-vcl',
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
}
# `vlogdump` is a small tool to filter the output of varnishlog
# See <https://github.com/cosimo/vlogdump> for more.
file { '/usr/local/bin/vlogdump':
- source => 'puppet:///modules/varnish/vlogdump',
- owner => 'root',
- group => 'root',
- mode => '0555',
+ source => 'puppet:///modules/varnish/vlogdump',
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
}
file { '/usr/local/lib/python2.7/dist-packages/varnishlog.py':
diff --git a/modules/varnish/manifests/common/vcl.pp
b/modules/varnish/manifests/common/vcl.pp
index 69b0696..41f63bd 100644
--- a/modules/varnish/manifests/common/vcl.pp
+++ b/modules/varnish/manifests/common/vcl.pp
@@ -42,10 +42,10 @@
}
file { '/etc/varnish/hhvm.inc.vcl':
- ensure => absent,
- owner => 'root',
- group => 'root',
- mode => '0444',
+ ensure => absent,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
}
# VCL unit tests
diff --git a/modules/varnish/manifests/instance.pp
b/modules/varnish/manifests/instance.pp
index edf4915..aa9af9b 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -99,10 +99,10 @@
}
base::service_unit { "varnish${instancesuffix}":
- template_name => 'varnish',
- systemd => true,
- sysvinit => true,
- refresh => false,
+ template_name => 'varnish',
+ systemd => true,
+ sysvinit => true,
+ refresh => false,
service_params => {
tag => 'varnish_instance',
enable => true,
@@ -143,10 +143,10 @@
}
exec { "retry-load-new-vcl-file${instancesuffix}":
- require => Exec["load-new-vcl-file${instancesuffix}"],
- command => "/usr/share/varnish/reload-vcl ${extraopts} && (rm
${vcl_failed_file}; true)",
- onlyif => "test -f ${vcl_failed_file}",
- path => '/bin:/usr/bin',
+ require => Exec["load-new-vcl-file${instancesuffix}"],
+ command => "/usr/share/varnish/reload-vcl ${extraopts} && (rm
${vcl_failed_file}; true)",
+ onlyif => "test -f ${vcl_failed_file}",
+ path => '/bin:/usr/bin',
}
monitoring::service { "varnish http ${title}":
diff --git a/modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
b/modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
index 8154651..caab4e8 100644
--- a/modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
+++ b/modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
@@ -1,10 +1,10 @@
class varnish::monitoring::ganglia::vhtcpd {
file { '/usr/lib/ganglia/python_modules/vhtcpd.py':
- source =>
"puppet:///modules/${module_name}/ganglia/ganglia-vhtcpd.py",
- owner => 'root',
- group => 'root',
- mode => '0444',
- notify => Service['ganglia-monitor'],
+ source =>
"puppet:///modules/${module_name}/ganglia/ganglia-vhtcpd.py",
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ notify => Service['ganglia-monitor'],
}
file { '/etc/ganglia/conf.d/vhtcpd.pyconf':
owner => 'root',
diff --git a/modules/varnish/manifests/zero_update.pp
b/modules/varnish/manifests/zero_update.pp
index f5b4f14..72709b3 100644
--- a/modules/varnish/manifests/zero_update.pp
+++ b/modules/varnish/manifests/zero_update.pp
@@ -26,14 +26,16 @@
class varnish::zero_update($site, $auth_content, $hour = '*', $minute = '*/5')
{
require 'varnish::netmapper_update_common'
- package { 'python-requests': ensure => installed; }
+ package { 'python-requests':
+ ensure => installed;
+ }
file { '/usr/share/varnish/zerofetch.py':
owner => 'root',
group => 'root',
mode => '0555',
source => "puppet:///modules/${module_name}/zerofetch.py",
- require => Package["python-requests"],
+ require => Package['python-requests'],
}
file { '/etc/zerofetcher':
@@ -48,23 +50,23 @@
group => 'netmap',
mode => '0400',
content => $auth_content,
- require => [File["/etc/zerofetcher"]],
+ require => File['/etc/zerofetcher'],
}
$cmd = "/usr/share/varnish/zerofetch.py -s \"${site}\" -a
/etc/zerofetcher/zerofetcher.auth -d /var/netmapper"
- exec { "zero_update_initial":
+ exec { 'zero_update_initial':
user => 'netmap',
command => $cmd,
- creates => "/var/netmapper/proxies.json",
- require => File["/etc/zerofetcher/zerofetcher.auth"],
+ creates => '/var/netmapper/proxies.json',
+ require => File['/etc/zerofetcher/zerofetcher.auth'],
}
- cron { "zero_update":
+ cron { 'zero_update':
user => 'netmap',
command => $cmd,
hour => $hour,
minute => $minute,
- require => File["/etc/zerofetcher/zerofetcher.auth"],
+ require => File['/etc/zerofetcher/zerofetcher.auth'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/211352
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86c85bb2ac239d7c379db2375f03f7fb0d97d2b5
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
