Juniorsys has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332109 )
Change subject: statistics module: Linting changes
......................................................................
statistics 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: I669acf9e842f5d384d6d96b88760e40d7f179d77
---
M modules/statistics/manifests/aggregator.pp
M modules/statistics/manifests/aggregator/projectview.pp
M modules/statistics/manifests/compute.pp
M modules/statistics/manifests/init.pp
M modules/statistics/manifests/mysql_credentials.pp
M modules/statistics/manifests/packages.pp
M modules/statistics/manifests/rsync_job.pp
M modules/statistics/manifests/rsyncd.pp
M modules/statistics/manifests/sites/analytics.pp
M modules/statistics/manifests/sites/datasets.pp
M modules/statistics/manifests/sites/metrics.pp
M modules/statistics/manifests/sites/pivot.pp
M modules/statistics/manifests/sites/stats.pp
M modules/statistics/manifests/sites/yarn.pp
M modules/statistics/manifests/user.pp
M modules/statistics/manifests/wmde.pp
16 files changed, 32 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/332109/1
diff --git a/modules/statistics/manifests/aggregator.pp
b/modules/statistics/manifests/aggregator.pp
index 1024aaa..c4ad0ed 100644
--- a/modules/statistics/manifests/aggregator.pp
+++ b/modules/statistics/manifests/aggregator.pp
@@ -14,7 +14,7 @@
ensure => 'directory',
owner => $user,
group => $group,
- mode => '0755'
+ mode => '0755',
}
git::clone { 'aggregator_code':
diff --git a/modules/statistics/manifests/aggregator/projectview.pp
b/modules/statistics/manifests/aggregator/projectview.pp
index f05b3de..a50d26e 100644
--- a/modules/statistics/manifests/aggregator/projectview.pp
+++ b/modules/statistics/manifests/aggregator/projectview.pp
@@ -6,7 +6,7 @@
# being calculated
#
class statistics::aggregator::projectview {
- require statistics::aggregator
+ require ::statistics::aggregator
# This class uses the cdh::hadoop::mount in order to get
# data files out of HDFS.
@@ -30,7 +30,7 @@
ensure => 'directory',
owner => $user,
group => $group,
- mode => '0755'
+ mode => '0755',
}
git::clone { 'aggregator_projectview_data':
diff --git a/modules/statistics/manifests/compute.pp
b/modules/statistics/manifests/compute.pp
index 57120e0..4b2d0eb 100644
--- a/modules/statistics/manifests/compute.pp
+++ b/modules/statistics/manifests/compute.pp
@@ -6,8 +6,8 @@
Class['::statistics::user'] -> Class['::statistics::compute']
- include statistics::dataset_mount
- include statistics::packages
+ include ::statistics::dataset_mount
+ include ::statistics::packages
require_package('udp-filter')
@@ -24,7 +24,7 @@
group => 'wikidev',
}
- include passwords::mysql::research
+ include ::passwords::mysql::research
# This file will render at
# /etc/mysql/conf.d/stats-research-client.cnf.
mysql::config::client { 'stats-research':
diff --git a/modules/statistics/manifests/init.pp
b/modules/statistics/manifests/init.pp
index 6968923..616a49d 100644
--- a/modules/statistics/manifests/init.pp
+++ b/modules/statistics/manifests/init.pp
@@ -12,7 +12,7 @@
$servers,
$working_path = '/srv'
) {
- include statistics::user
+ include ::statistics::user
file { $working_path:
ensure => 'directory',
@@ -31,7 +31,7 @@
# set up rsync modules for copying files
# on statistic servers in $working_path
- class { 'statistics::rsyncd':
+ class { '::statistics::rsyncd':
path => $working_path,
hosts_allow => $servers,
}
diff --git a/modules/statistics/manifests/mysql_credentials.pp
b/modules/statistics/manifests/mysql_credentials.pp
index 7a87296..5f2f2cf 100644
--- a/modules/statistics/manifests/mysql_credentials.pp
+++ b/modules/statistics/manifests/mysql_credentials.pp
@@ -4,7 +4,7 @@
define statistics::mysql_credentials(
$group,
) {
- include passwords::mysql::research
+ include ::passwords::mysql::research
# This file will render at
# /etc/mysql/conf.d/research-client.cnf.
mysql::config::client { $title:
diff --git a/modules/statistics/manifests/packages.pp
b/modules/statistics/manifests/packages.pp
index df5ea96..f476753 100644
--- a/modules/statistics/manifests/packages.pp
+++ b/modules/statistics/manifests/packages.pp
@@ -2,8 +2,8 @@
# Various packages useful for statistics crunching on stat-type hosts
class statistics::packages {
# include mysql module base class to install mysql client
- include mysql
- include geoip
+ include ::mysql
+ include ::geoip
include ::imagemagick::install
ensure_packages([
@@ -88,7 +88,7 @@
'libploticus0',
'libcairo2',
'libcairo2-dev',
- 'libxt-dev'
+ 'libxt-dev',
])
$r_packages = [
diff --git a/modules/statistics/manifests/rsync_job.pp
b/modules/statistics/manifests/rsync_job.pp
index 9d4e28f..2fec10a 100644
--- a/modules/statistics/manifests/rsync_job.pp
+++ b/modules/statistics/manifests/rsync_job.pp
@@ -14,7 +14,7 @@
#
define statistics::rsync_job($source, $destination, $retention_days = undef,
$ensure = 'present') {
Class['::statistics'] -> Statistics::Rsync_job[$name]
- require statistics::user
+ require ::statistics::user
# ensure that the destination directory exists
unless defined(File[$destination]) {
diff --git a/modules/statistics/manifests/rsyncd.pp
b/modules/statistics/manifests/rsyncd.pp
index 6b17176..702bb18 100644
--- a/modules/statistics/manifests/rsyncd.pp
+++ b/modules/statistics/manifests/rsyncd.pp
@@ -13,7 +13,7 @@
# this uses modules/rsync to
# set up an rsync daemon service
- class { 'rsync::server':
+ class { '::rsync::server':
# the default timeout of 300 is too low
timeout => 1000,
}
diff --git a/modules/statistics/manifests/sites/analytics.pp
b/modules/statistics/manifests/sites/analytics.pp
index f128194..1737a2b 100644
--- a/modules/statistics/manifests/sites/analytics.pp
+++ b/modules/statistics/manifests/sites/analytics.pp
@@ -8,10 +8,10 @@
# Bug: T132407
#
class statistics::sites::analytics {
- require statistics::web
+ require ::statistics::web
# /srv/analytics.wikimedia.org
- $document_root = "${$::statistics::working_path}/analytics.wikimedia.org"
+ $document_root = "${::statistics::working_path}/analytics.wikimedia.org"
# Allow statistics-web-users to modify files in this directory.
git::clone { 'analytics.wikimedia.org':
@@ -23,7 +23,7 @@
mode => '0775',
}
- include apache::mod::headers
+ include ::apache::mod::headers
apache::site { 'analytics':
content => template('statistics/analytics.wikimedia.org.erb'),
require => File[$document_root],
diff --git a/modules/statistics/manifests/sites/datasets.pp
b/modules/statistics/manifests/sites/datasets.pp
index 169e075..740f7dc 100644
--- a/modules/statistics/manifests/sites/datasets.pp
+++ b/modules/statistics/manifests/sites/datasets.pp
@@ -7,12 +7,12 @@
# dataset1001 datasets_mount.
#
class statistics::sites::datasets {
- require statistics::web
+ require ::statistics::web
$working_path = $::statistics::working_path
file { [
"${working_path}/public-datasets",
- "${working_path}/aggregate-datasets"
+ "${working_path}/aggregate-datasets",
]:
ensure => 'directory',
owner => 'root',
@@ -63,7 +63,7 @@
minute => '*/30',
}
- include apache::mod::headers
+ include ::apache::mod::headers
apache::site { 'datasets':
source => 'puppet:///modules/statistics/datasets.wikimedia.org',
}
diff --git a/modules/statistics/manifests/sites/metrics.pp
b/modules/statistics/manifests/sites/metrics.pp
index b8736c5..b56ccad 100644
--- a/modules/statistics/manifests/sites/metrics.pp
+++ b/modules/statistics/manifests/sites/metrics.pp
@@ -3,7 +3,7 @@
# They should just redirect to Wikimetrics
#
class statistics::sites::metrics {
- require statistics::web
+ require ::statistics::web
include ::apache::mod::alias
diff --git a/modules/statistics/manifests/sites/pivot.pp
b/modules/statistics/manifests/sites/pivot.pp
index cb9db32..db7ec2d 100644
--- a/modules/statistics/manifests/sites/pivot.pp
+++ b/modules/statistics/manifests/sites/pivot.pp
@@ -21,7 +21,7 @@
# Bug: T138262
#
class statistics::sites::pivot {
- require statistics::web
+ require ::statistics::web
include ::apache::mod::proxy_http
include ::apache::mod::proxy
diff --git a/modules/statistics/manifests/sites/stats.pp
b/modules/statistics/manifests/sites/stats.pp
index 911fbf6..9c54e55 100644
--- a/modules/statistics/manifests/sites/stats.pp
+++ b/modules/statistics/manifests/sites/stats.pp
@@ -1,10 +1,10 @@
# == Class statistics::sites::stats
# stats.wikimedia.org
class statistics::sites::stats {
- require statistics::web
+ require ::statistics::web
- require geowiki::private_data
- include geowiki::params
+ require ::geowiki::private_data
+ include ::geowiki::params
$geowiki_private_directory =
'/srv/stats.wikimedia.org/htdocs/geowiki-private'
$geowiki_private_htpasswd_file = '/etc/apache2/htpasswd.stats-geowiki'
diff --git a/modules/statistics/manifests/sites/yarn.pp
b/modules/statistics/manifests/sites/yarn.pp
index 7464fee..ec58e8e 100644
--- a/modules/statistics/manifests/sites/yarn.pp
+++ b/modules/statistics/manifests/sites/yarn.pp
@@ -7,7 +7,7 @@
# Bug: T116192
#
class statistics::sites::yarn {
- require statistics::web
+ require ::statistics::web
include ::apache::mod::proxy_http
include ::apache::mod::proxy
diff --git a/modules/statistics/manifests/user.pp
b/modules/statistics/manifests/user.pp
index 7ebb35b..73b32c3 100644
--- a/modules/statistics/manifests/user.pp
+++ b/modules/statistics/manifests/user.pp
@@ -1,5 +1,5 @@
class statistics::user {
- include passwords::statistics::user
+ include ::passwords::statistics::user
$username = 'stats'
$homedir = "/var/lib/${username}"
@@ -15,7 +15,7 @@
groups => ['wikidev'],
shell => '/bin/bash',
managehome => true,
- system => true
+ system => true,
}
# lint:ignore:arrow_alignment
diff --git a/modules/statistics/manifests/wmde.pp
b/modules/statistics/manifests/wmde.pp
index 70fcb38..795f4bd 100644
--- a/modules/statistics/manifests/wmde.pp
+++ b/modules/statistics/manifests/wmde.pp
@@ -15,8 +15,8 @@
Class['::statistics'] -> Class['::statistics::wmde']
$statistics_working_path = $::statistics::working_path
- class { 'statistics::wmde::user':
- homedir => "${statistics_working_path}/analytics-wmde"
+ class { '::statistics::wmde::user':
+ homedir => "${statistics_working_path}/analytics-wmde",
}
$user = $statistics::wmde::user::username
$dir = $statistics::wmde::user::homedir
@@ -38,7 +38,7 @@
'php5-cli',
)
- include passwords::mysql::research
+ include ::passwords::mysql::research
# This file will render at
# /etc/mysql/conf.d/research-wmde-client.cnf.
mysql::config::client { 'research-wmde':
@@ -53,7 +53,7 @@
$dir,
"${dir}/src",
"${dir}/data",
- $log_dir
+ $log_dir,
]
file { $directories:
--
To view, visit https://gerrit.wikimedia.org/r/332109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I669acf9e842f5d384d6d96b88760e40d7f179d77
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys <juniorsys_wikime...@outlook.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
