Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334308 )
Change subject: planet/pmacct/programdashboard/pybal lint changes
......................................................................
planet/pmacct/programdashboard/pybal lint 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: Ia2508c41d679d4679df86f82146a3e715f8dc29e
---
M modules/planet/manifests/init.pp
M modules/pmacct/manifests/init.pp
M modules/programdashboard/manifests/app.pp
M modules/pybal/manifests/monitoring.pp
M modules/pybal/manifests/web/service.pp
5 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 4ca476a..ad01734 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -27,11 +27,11 @@
# locales are essential for planet
# if a new language is added check these too
- include standard
- include locales::extended
+ include ::standard
+ include ::locales::extended
# things done once for all planets
- include planet::webserver,
+ include ::planet::webserver,
planet::packages,
planet::dirs,
planet::user,
diff --git a/modules/pmacct/manifests/init.pp b/modules/pmacct/manifests/init.pp
index 24859bf..2b19ff6 100644
--- a/modules/pmacct/manifests/init.pp
+++ b/modules/pmacct/manifests/init.pp
@@ -9,7 +9,7 @@
# include pmacct
class pmacct {
- require geoip
+ require ::geoip
package { 'pmacct':
ensure => present,
diff --git a/modules/programdashboard/manifests/app.pp
b/modules/programdashboard/manifests/app.pp
index fdf02f9..72d4df9 100644
--- a/modules/programdashboard/manifests/app.pp
+++ b/modules/programdashboard/manifests/app.pp
@@ -26,11 +26,11 @@
$owner,
$group,
) {
- require programdashboard
+ require ::programdashboard
- include apt
- include apache
- include apache::mod::passenger
+ include ::apt
+ include ::apache
+ include ::apache::mod::passenger
require_package($dependencies)
diff --git a/modules/pybal/manifests/monitoring.pp
b/modules/pybal/manifests/monitoring.pp
index bb37a7d..5b56cda 100644
--- a/modules/pybal/manifests/monitoring.pp
+++ b/modules/pybal/manifests/monitoring.pp
@@ -6,7 +6,7 @@
require_package('libnagios-plugin-perl')
diamond::collector { 'PyBalState':
- source => 'puppet:///modules/pybal/pybal_state.py'
+ source => 'puppet:///modules/pybal/pybal_state.py',
}
file { '/usr/local/lib/nagios/plugins/check_pybal':
@@ -20,7 +20,7 @@
nrpe::monitor_service { 'pybal_backends':
description => 'PyBal backends health check',
nrpe_command => '/usr/local/lib/nagios/plugins/check_pybal --url
http://localhost:9090/alerts',
- require => File['/usr/local/lib/nagios/plugins/check_pybal']
+ require => File['/usr/local/lib/nagios/plugins/check_pybal'],
}
}
diff --git a/modules/pybal/manifests/web/service.pp
b/modules/pybal/manifests/web/service.pp
index 2815df0..62ef802 100644
--- a/modules/pybal/manifests/web/service.pp
+++ b/modules/pybal/manifests/web/service.pp
@@ -15,7 +15,7 @@
dc => $dc,
cluster => $cluster,
service => $service_name,
- require => File[$::pybal::web::conftool_dir]
+ require => File[$::pybal::web::conftool_dir],
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/334308
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2508c41d679d4679df86f82146a3e715f8dc29e
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Dereckson <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
