Ema has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332113 )
Change subject: varnish module: Linting changes
......................................................................
varnish module: Linting changes
Use full names for class names, as relative names are not allowed in
future Puppet versions
Add trailing commas to abide by the Coding Style guidelines
Bug: T93645
Change-Id: Ibc3bed34606cff57ba7d3cc1a5bda0338d2efef4
---
M modules/varnish/manifests/common.pp
M modules/varnish/manifests/common/director_scripts.pp
M modules/varnish/manifests/common/directors.pp
M modules/varnish/manifests/common/vcl.pp
M modules/varnish/manifests/instance.pp
M modules/varnish/manifests/logging/media.pp
M modules/varnish/manifests/logging/rls.pp
M modules/varnish/manifests/logging/xcache.pp
M modules/varnish/manifests/logging/xcps.pp
M modules/varnish/manifests/monitoring/instance.pp
M modules/varnish/manifests/packages.pp
M modules/varnish/manifests/remove_instance.pp
M modules/varnish/manifests/setup_filesystem.pp
M modules/varnish/manifests/zero_update.pp
14 files changed, 18 insertions(+), 18 deletions(-)
Approvals:
Ema: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/manifests/common.pp
b/modules/varnish/manifests/common.pp
index d3130c7..866dd25 100644
--- a/modules/varnish/manifests/common.pp
+++ b/modules/varnish/manifests/common.pp
@@ -1,5 +1,5 @@
class varnish::common {
- require varnish::packages
+ require ::varnish::packages
# Mount /var/lib/ganglia as tmpfs to avoid Linux flushing mlocked
# shm memory to disk
@@ -82,7 +82,7 @@
# We don't use varnishlog at all, and it can become an issue, see T135700
service { 'varnishlog':
- ensure => 'stopped'
+ ensure => 'stopped',
}
# varnishlog.py depends on varnishapi. Install it.
diff --git a/modules/varnish/manifests/common/director_scripts.pp
b/modules/varnish/manifests/common/director_scripts.pp
index 7377e7d..3fa3a84 100644
--- a/modules/varnish/manifests/common/director_scripts.pp
+++ b/modules/varnish/manifests/common/director_scripts.pp
@@ -5,7 +5,7 @@
owner => 'root',
group => 'root',
mode => '0544',
- source => 'puppet:///modules/varnish/confd-reload-vcl'
+ source => 'puppet:///modules/varnish/confd-reload-vcl',
}
file { '/usr/local/lib/nagios/plugins/check_vcl_reload':
diff --git a/modules/varnish/manifests/common/directors.pp
b/modules/varnish/manifests/common/directors.pp
index b217840..c8f8502 100644
--- a/modules/varnish/manifests/common/directors.pp
+++ b/modules/varnish/manifests/common/directors.pp
@@ -9,7 +9,7 @@
{
$conftool_namespace = '/conftool/v1/pools'
- require varnish::common::director_scripts
+ require ::varnish::common::director_scripts
$service_name = $instance ? {
'frontend' => 'varnish-frontend',
diff --git a/modules/varnish/manifests/common/vcl.pp
b/modules/varnish/manifests/common/vcl.pp
index d8a67e8..7761eb5 100644
--- a/modules/varnish/manifests/common/vcl.pp
+++ b/modules/varnish/manifests/common/vcl.pp
@@ -1,5 +1,5 @@
class varnish::common::vcl {
- require varnish::common
+ require ::varnish::common
file { '/etc/varnish/errorpage.inc.vcl':
owner => 'root',
diff --git a/modules/varnish/manifests/instance.pp
b/modules/varnish/manifests/instance.pp
index a4d21ee..aedfb7f 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -13,7 +13,7 @@
$extra_vcl = []
) {
- include varnish::common
+ include ::varnish::common
$runtime_params = join(prefix($runtime_parameters, '-p '), ' ')
if $name == '' {
@@ -32,11 +32,11 @@
$dynamic_backend_caches = hiera('varnish::dynamic_backend_caches', true)
# Install VCL include files shared by all instances
- require varnish::common::vcl
+ require ::varnish::common::vcl
$extra_vcl_variable_to_make_puppet_parser_happy = suffix($extra_vcl, "
${instancesuffix}")
extra_vcl{ $extra_vcl_variable_to_make_puppet_parser_happy:
- before => Service["varnish${instancesuffix}"]
+ before => Service["varnish${instancesuffix}"],
}
# Write the dynamic backend caches configuration, if we need it
@@ -131,7 +131,7 @@
File["/etc/varnish/wikimedia-common_${vcl}.inc.vcl"],
Mount['/var/lib/varnish'],
],
- }
+ },
}
# This mechanism with the touch/rm conditionals in the pair of execs
diff --git a/modules/varnish/manifests/logging/media.pp
b/modules/varnish/manifests/logging/media.pp
index 4434f70..4a25e0b 100644
--- a/modules/varnish/manifests/logging/media.pp
+++ b/modules/varnish/manifests/logging/media.pp
@@ -16,7 +16,7 @@
# }
#
define varnish::logging::media( $statsd_server = 'statsd' ) {
- include varnish::common
+ include ::varnish::common
file { '/usr/local/bin/varnishmedia':
source => 'puppet:///modules/varnish/varnishmedia',
diff --git a/modules/varnish/manifests/logging/rls.pp
b/modules/varnish/manifests/logging/rls.pp
index 5fa7375..238066a 100644
--- a/modules/varnish/manifests/logging/rls.pp
+++ b/modules/varnish/manifests/logging/rls.pp
@@ -16,7 +16,7 @@
# }
#
define varnish::logging::rls( $statsd_server = 'statsd' ) {
- include varnish::common
+ include ::varnish::common
file { '/usr/local/bin/varnishrls':
source => 'puppet:///modules/varnish/varnishrls',
diff --git a/modules/varnish/manifests/logging/xcache.pp
b/modules/varnish/manifests/logging/xcache.pp
index a69bd65..0e5b277 100644
--- a/modules/varnish/manifests/logging/xcache.pp
+++ b/modules/varnish/manifests/logging/xcache.pp
@@ -24,7 +24,7 @@
$statsd_server = 'localhost:8125',
$key_prefix = 'test.varnish.xcache',
) {
- include varnish::common
+ include ::varnish::common
file { '/usr/local/bin/varnishxcache':
source => 'puppet:///modules/varnish/varnishxcache',
diff --git a/modules/varnish/manifests/logging/xcps.pp
b/modules/varnish/manifests/logging/xcps.pp
index 09cbf4f..19304d7 100644
--- a/modules/varnish/manifests/logging/xcps.pp
+++ b/modules/varnish/manifests/logging/xcps.pp
@@ -16,7 +16,7 @@
# }
#
define varnish::logging::xcps( $statsd_server = 'statsd' ) {
- include varnish::common
+ include ::varnish::common
file { '/usr/local/bin/varnishxcps':
source => 'puppet:///modules/varnish/varnishxcps',
diff --git a/modules/varnish/manifests/monitoring/instance.pp
b/modules/varnish/manifests/monitoring/instance.pp
index a057580..f20feb3 100644
--- a/modules/varnish/manifests/monitoring/instance.pp
+++ b/modules/varnish/manifests/monitoring/instance.pp
@@ -2,6 +2,6 @@
$port = $title
monitoring::service { "varnish http ${instance} - port ${port}":
description => "Varnish HTTP ${instance} - port ${port}",
- check_command => "check_http_varnish!varnishcheck!${port}"
+ check_command => "check_http_varnish!varnishcheck!${port}",
}
}
diff --git a/modules/varnish/manifests/packages.pp
b/modules/varnish/manifests/packages.pp
index 3701b54..bab77c6 100644
--- a/modules/varnish/manifests/packages.pp
+++ b/modules/varnish/manifests/packages.pp
@@ -9,7 +9,7 @@
# Install VMODs on Varnish 4 instances
package { 'libvmod-header':
- ensure => 'absent'
+ ensure => 'absent',
}
package { [
'varnish-modules',
diff --git a/modules/varnish/manifests/remove_instance.pp
b/modules/varnish/manifests/remove_instance.pp
index abdc505..2847777 100644
--- a/modules/varnish/manifests/remove_instance.pp
+++ b/modules/varnish/manifests/remove_instance.pp
@@ -3,7 +3,7 @@
# defined varnish::instance is configured and/or started.
define varnish::remove_instance() {
- require varnish::common
+ require ::varnish::common
$suffix = $title
diff --git a/modules/varnish/manifests/setup_filesystem.pp
b/modules/varnish/manifests/setup_filesystem.pp
index 8db9d01..afaa60a 100644
--- a/modules/varnish/manifests/setup_filesystem.pp
+++ b/modules/varnish/manifests/setup_filesystem.pp
@@ -15,7 +15,7 @@
$mount_options = "noatime${custom_mount_opts}"
if $::realm == 'labs' and $::site == 'eqiad' {
- include labs_lvm
+ include ::labs_lvm
labs_lvm::volume { $title:
mountat => "/srv/${title}",
options => $mount_options,
diff --git a/modules/varnish/manifests/zero_update.pp
b/modules/varnish/manifests/zero_update.pp
index 673bca6..80d18a8 100644
--- a/modules/varnish/manifests/zero_update.pp
+++ b/modules/varnish/manifests/zero_update.pp
@@ -1,6 +1,6 @@
# Zero-specific update stuff
class varnish::zero_update($site) {
- require 'varnish::netmapper_update_common'
+ require '::varnish::netmapper_update_common'
package { 'python-requests':
ensure => installed;
--
To view, visit https://gerrit.wikimedia.org/r/332113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc3bed34606cff57ba7d3cc1a5bda0338d2efef4
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys <juniorsys_wikime...@outlook.com>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
