Juniorsys has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332097 )
Change subject: dataset module: Linting changes
......................................................................
dataset 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: I6090bd9f3fc5d0112ec370f472f2106e3ab4d194
---
M modules/dataset/manifests/common.pp
M modules/dataset/manifests/cron/kiwix.pp
M modules/dataset/manifests/cron/rsync/labs.pp
M modules/dataset/manifests/cron/rsync/nginxlogs.pp
M modules/dataset/manifests/cron/rsync/peers.pp
M modules/dataset/manifests/cron/wikitech_dumps.pp
M modules/dataset/manifests/dirs.pp
M modules/dataset/manifests/html.pp
M modules/dataset/manifests/init.pp
M modules/dataset/manifests/rsync/pagecounts_ez.pp
M modules/dataset/manifests/rsync/peers.pp
M modules/dataset/manifests/rsync/phab_dump.pp
M modules/dataset/manifests/rsync/public.pp
M modules/dataset/manifests/user.pp
14 files changed, 29 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/332097/1
diff --git a/modules/dataset/manifests/common.pp
b/modules/dataset/manifests/common.pp
index c0417cf..85f8ace 100644
--- a/modules/dataset/manifests/common.pp
+++ b/modules/dataset/manifests/common.pp
@@ -3,5 +3,5 @@
ensure => present,
}
- include vm::higher_min_free_kbytes
+ include ::vm::higher_min_free_kbytes
}
diff --git a/modules/dataset/manifests/cron/kiwix.pp
b/modules/dataset/manifests/cron/kiwix.pp
index 46cfaf0..b1ed8bd 100644
--- a/modules/dataset/manifests/cron/kiwix.pp
+++ b/modules/dataset/manifests/cron/kiwix.pp
@@ -9,7 +9,7 @@
$ensure = 'absent'
}
- include dataset::common
+ include ::dataset::common
group { 'mirror':
ensure => 'present',
diff --git a/modules/dataset/manifests/cron/rsync/labs.pp
b/modules/dataset/manifests/cron/rsync/labs.pp
index 50f5403..f6fad4f 100644
--- a/modules/dataset/manifests/cron/rsync/labs.pp
+++ b/modules/dataset/manifests/cron/rsync/labs.pp
@@ -1,5 +1,5 @@
class dataset::cron::rsync::labs($enable=true) {
- include dataset::common
+ include ::dataset::common
if ($enable) {
$ensure = 'present'
diff --git a/modules/dataset/manifests/cron/rsync/nginxlogs.pp
b/modules/dataset/manifests/cron/rsync/nginxlogs.pp
index 6bbd3bf..c9624fc 100644
--- a/modules/dataset/manifests/cron/rsync/nginxlogs.pp
+++ b/modules/dataset/manifests/cron/rsync/nginxlogs.pp
@@ -4,7 +4,7 @@
$user = 'root',
)
{
- include dataset::common
+ include ::dataset::common
$ensure = $enable ? {
true => 'present',
diff --git a/modules/dataset/manifests/cron/rsync/peers.pp
b/modules/dataset/manifests/cron/rsync/peers.pp
index 116789e..a6c86fa 100644
--- a/modules/dataset/manifests/cron/rsync/peers.pp
+++ b/modules/dataset/manifests/cron/rsync/peers.pp
@@ -1,5 +1,5 @@
class dataset::cron::rsync::peers($enable=true) {
- include dataset::common
+ include ::dataset::common
if ($enable) {
$ensure = 'present'
diff --git a/modules/dataset/manifests/cron/wikitech_dumps.pp
b/modules/dataset/manifests/cron/wikitech_dumps.pp
index 38dcf03..987085c 100644
--- a/modules/dataset/manifests/cron/wikitech_dumps.pp
+++ b/modules/dataset/manifests/cron/wikitech_dumps.pp
@@ -11,7 +11,7 @@
$ensure = 'absent'
}
- include dataset::dirs
+ include ::dataset::dirs
$wikitechdir = "${dataset::dirs::otherdir}/wikitech"
diff --git a/modules/dataset/manifests/dirs.pp
b/modules/dataset/manifests/dirs.pp
index b4214ea..4cdfcb2 100644
--- a/modules/dataset/manifests/dirs.pp
+++ b/modules/dataset/manifests/dirs.pp
@@ -77,7 +77,7 @@
# needs to be relative because it is mounted via NFS at differing names
file { "${publicdir}/wikidatawiki/entities":
ensure => 'link',
- target => "../${relative_wikidatawiki}"
+ target => "../${relative_wikidatawiki}",
}
# Legacy
diff --git a/modules/dataset/manifests/html.pp
b/modules/dataset/manifests/html.pp
index 9ba1d39..d358587 100644
--- a/modules/dataset/manifests/html.pp
+++ b/modules/dataset/manifests/html.pp
@@ -7,7 +7,7 @@
$analytics = true,
) {
- include dataset::dirs
+ include ::dataset::dirs
if ($other) {
file { "${dataset::dirs::otherdir}/index.html":
diff --git a/modules/dataset/manifests/init.pp
b/modules/dataset/manifests/init.pp
index ee86c95..c60f017 100644
--- a/modules/dataset/manifests/init.pp
+++ b/modules/dataset/manifests/init.pp
@@ -17,12 +17,12 @@
$grabs = {}
) {
- include dataset::common
- require dataset::user
+ include ::dataset::common
+ require ::dataset::user
$rsync_public_enable = has_key($rsync,'public')
- class { 'dataset::rsync::public': enable => $rsync_public_enable }
- class { 'dataset::rsync::default': public => $rsync_public_enable }
+ class { '::dataset::rsync::public': enable => $rsync_public_enable }
+ class { '::dataset::rsync::default': public => $rsync_public_enable }
if ($nfs) {
$nfs_enable = true
@@ -30,25 +30,25 @@
else {
$nfs_enable = false
}
- class { 'dataset::nfs': enable => $nfs_enable }
+ class { '::dataset::nfs': enable => $nfs_enable }
$rsync_peers_enable = has_key($rsync,'peers')
- class { 'dataset::rsync::peers': enable => $rsync_peers_enable }
- class { 'dataset::cron::rsync::peers': enable => $rsync_peers_enable }
+ class { '::dataset::rsync::peers': enable => $rsync_peers_enable }
+ class { '::dataset::cron::rsync::peers': enable => $rsync_peers_enable }
$rsync_labs_enable = has_key($rsync,'labs')
- class { 'dataset::cron::rsync::labs': enable => $rsync_labs_enable }
+ class { '::dataset::cron::rsync::labs': enable => $rsync_labs_enable }
$uploads_pagecounts_ez_enable = has_key($uploads,'pagecounts_ez')
- class { 'dataset::rsync::pagecounts_ez':
+ class { '::dataset::rsync::pagecounts_ez':
enable => $uploads_pagecounts_ez_enable }
$uploads_phab_dump_enable = has_key($uploads,'phab')
- class { 'dataset::rsync::phab_dump':
+ class { '::dataset::rsync::phab_dump':
enable => $uploads_phab_dump_enable }
$grabs_kiwix_enable = has_key($grabs,'kiwix')
- class { 'dataset::cron::kiwix': enable => $grabs_kiwix_enable }
+ class { '::dataset::cron::kiwix': enable => $grabs_kiwix_enable }
- include dataset::html
+ include ::dataset::html
}
diff --git a/modules/dataset/manifests/rsync/pagecounts_ez.pp
b/modules/dataset/manifests/rsync/pagecounts_ez.pp
index ff1651e..6ff2de2 100644
--- a/modules/dataset/manifests/rsync/pagecounts_ez.pp
+++ b/modules/dataset/manifests/rsync/pagecounts_ez.pp
@@ -6,8 +6,8 @@
$ensure = 'absent'
}
- include dataset::common
- include dataset::rsync::common
+ include ::dataset::common
+ include ::dataset::rsync::common
file { '/etc/rsyncd.d/30-rsync-pagecounts_ez.conf':
ensure => $ensure,
diff --git a/modules/dataset/manifests/rsync/peers.pp
b/modules/dataset/manifests/rsync/peers.pp
index 957bebd..f831fdf 100644
--- a/modules/dataset/manifests/rsync/peers.pp
+++ b/modules/dataset/manifests/rsync/peers.pp
@@ -6,9 +6,9 @@
$ensure = 'absent'
}
- include dataset::common
+ include ::dataset::common
- include dataset::rsync::common
+ include ::dataset::rsync::common
file { '/etc/rsyncd.d/10-rsync-datasets_to_peers.conf':
ensure => $ensure,
mode => '0444',
diff --git a/modules/dataset/manifests/rsync/phab_dump.pp
b/modules/dataset/manifests/rsync/phab_dump.pp
index d663db1..44876b6 100644
--- a/modules/dataset/manifests/rsync/phab_dump.pp
+++ b/modules/dataset/manifests/rsync/phab_dump.pp
@@ -6,9 +6,9 @@
$ensure = 'absent'
}
- include dataset::common
+ include ::dataset::common
- include dataset::rsync::common
+ include ::dataset::rsync::common
file { '/etc/rsyncd.d/40-rsync-phab_dump.conf':
ensure => $ensure,
mode => '0444',
diff --git a/modules/dataset/manifests/rsync/public.pp
b/modules/dataset/manifests/rsync/public.pp
index 80b696f..669062d 100644
--- a/modules/dataset/manifests/rsync/public.pp
+++ b/modules/dataset/manifests/rsync/public.pp
@@ -6,8 +6,8 @@
$ensure = 'absent'
}
- include dataset::common
- include dataset::rsync::common
+ include ::dataset::common
+ include ::dataset::rsync::common
file { '/etc/rsyncd.d/20-rsync-dumps_to_public.conf':
ensure => $ensure,
mode => '0444',
diff --git a/modules/dataset/manifests/user.pp
b/modules/dataset/manifests/user.pp
index e856859..2573bce 100644
--- a/modules/dataset/manifests/user.pp
+++ b/modules/dataset/manifests/user.pp
@@ -16,7 +16,7 @@
$keys = [
'ssh-rsa
AAAAB3NzaC1yc2EAAAABIwAAAQEAuLqmSdltCJzltgEin2j/72k/g7RroS1SE+Tvfh2JRPs2PhWweOJ+omtVp4x+YFNCGBg5wW2GaUnyZkUY0ARzv59aNLsGg87aCCY3J1oAudQ7b+yjrEaE8QebYDPmGTXRDV2osPbXf5UFTzl/O350vRy4q6UHRH+StflSOKhvundwf9QAs2RXNd+96kRe+r8YRcMBGmaJFX3OD9U+Z+gZID8knTvBceVGibEsnYKhHLXLYvMkQF3RfBuZHSsWZiiiXajlcutrLTo8eoG1nCj/FLK1slEXzgopcXEBiX1/LQAGXjgUVF7WmnKZELVCabqY6Qbk+qcmpaM8dL50P4WNdw==
datasets_rsync',
- 'ssh-rsa
AAAAB3NzaC1yc2EAAAADAQABAAABAQC8dqOJdtE9YaGS90S3i782TNT5CjMVl2n39f+oHgsiBrAuUglhWvG2FKGyiQzS3cj1akPDcpFRCBRH4oNeIFydfoR3yTcv/6ixwxSZPNwx8HTNEi/GlrPuK24RnNqRRQZuU7UhOC26VIFlgghk9ioiheOEogSkfd1yYhhVi0csQcqg0bBtl3w92L2gcmkG6Mp07HyFBUqEnL/mWtDIhVHrK3Va6f+T9b3SoQ/S5htf6P3zJ7Af2UQlFTvyViU5VY13aC9d6S5yA7UGp8tXWfAu/HnuruNz5HdrOVsCReLaaMzgnZBsgOIOC/euZvni6bxM3tHBcMEXCYM/2/urLB+F
datasets_deploy'
+ 'ssh-rsa
AAAAB3NzaC1yc2EAAAADAQABAAABAQC8dqOJdtE9YaGS90S3i782TNT5CjMVl2n39f+oHgsiBrAuUglhWvG2FKGyiQzS3cj1akPDcpFRCBRH4oNeIFydfoR3yTcv/6ixwxSZPNwx8HTNEi/GlrPuK24RnNqRRQZuU7UhOC26VIFlgghk9ioiheOEogSkfd1yYhhVi0csQcqg0bBtl3w92L2gcmkG6Mp07HyFBUqEnL/mWtDIhVHrK3Va6f+T9b3SoQ/S5htf6P3zJ7Af2UQlFTvyViU5VY13aC9d6S5yA7UGp8tXWfAu/HnuruNz5HdrOVsCReLaaMzgnZBsgOIOC/euZvni6bxM3tHBcMEXCYM/2/urLB+F
datasets_deploy',
]
ssh::userkey { 'datasets':
ensure => present,
--
To view, visit https://gerrit.wikimedia.org/r/332097
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6090bd9f3fc5d0112ec370f472f2106e3ab4d194
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
