Juniorsys has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332112 )
Change subject: torrus module: Linting changes
......................................................................
torrus 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: I44d3a3fbaa9aa2958987d738dbfc8cde7a87fdb6
---
M modules/torrus/manifests/discovery.pp
M modules/torrus/manifests/init.pp
M modules/torrus/manifests/xmlconfig.pp
M modules/torrus/tests/cdn.pp
M modules/torrus/tests/config.pp
M modules/torrus/tests/discovery.pp
M modules/torrus/tests/init.pp
M modules/torrus/tests/web.pp
M modules/torrus/tests/xmlconfig.pp
9 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/332112/1
diff --git a/modules/torrus/manifests/discovery.pp
b/modules/torrus/manifests/discovery.pp
index b5503a6..1f28c0c 100644
--- a/modules/torrus/manifests/discovery.pp
+++ b/modules/torrus/manifests/discovery.pp
@@ -1,6 +1,6 @@
class torrus::discovery {
- require torrus::config
- require torrus::xmlconfig
+ require ::torrus::config
+ require ::torrus::xmlconfig
file { '/etc/torrus/discovery':
ensure => directory,
diff --git a/modules/torrus/manifests/init.pp b/modules/torrus/manifests/init.pp
index 53cd60f..108168c 100644
--- a/modules/torrus/manifests/init.pp
+++ b/modules/torrus/manifests/init.pp
@@ -37,6 +37,6 @@
hasrestart => false,
}
- include torrus::xmlconfig
- include torrus::discovery
+ include ::torrus::xmlconfig
+ include ::torrus::discovery
}
diff --git a/modules/torrus/manifests/xmlconfig.pp
b/modules/torrus/manifests/xmlconfig.pp
index 0a460a3..95f68f0 100644
--- a/modules/torrus/manifests/xmlconfig.pp
+++ b/modules/torrus/manifests/xmlconfig.pp
@@ -1,6 +1,6 @@
class torrus::xmlconfig {
- require torrus::config
- include passwords::network
+ require ::torrus::config
+ include ::passwords::network
file { '/etc/torrus/xmlconfig/':
source => 'puppet:///modules/torrus/xmlconfig/',
diff --git a/modules/torrus/tests/cdn.pp b/modules/torrus/tests/cdn.pp
index 936efc9..7909005 100644
--- a/modules/torrus/tests/cdn.pp
+++ b/modules/torrus/tests/cdn.pp
@@ -16,7 +16,7 @@
'ulsfo' => [
'cp4008.ulsfo.wmnet',
'cp4018.ulsfo.wmnet',
- ]
+ ],
},
'upload' => {
'eqiad' => [
@@ -41,13 +41,13 @@
],
'ulsfo' => ['cp4011.ulsfo.wmnet',
'cp4020.ulsfo.wmnet',
- ]
+ ],
},
'misc' => {
'eqiad' => [],
'esams' => [],
'ulsfo' => [],
- }
+ },
},
'labs' => {
'mobile' => {
@@ -93,8 +93,8 @@
'appservers_debug' => {
'eqiad' => [ '10.68.19.128' ], # deployment-mediawiki04
},
- }
+ },
}
}
-include torrus::xml_generation::cdn
+include ::torrus::xml_generation::cdn
diff --git a/modules/torrus/tests/config.pp b/modules/torrus/tests/config.pp
index f91bfee..f9fa172 100644
--- a/modules/torrus/tests/config.pp
+++ b/modules/torrus/tests/config.pp
@@ -1,3 +1,3 @@
#
-include torrus::config
+include ::torrus::config
diff --git a/modules/torrus/tests/discovery.pp
b/modules/torrus/tests/discovery.pp
index 81ba34b..7e5a6b1 100644
--- a/modules/torrus/tests/discovery.pp
+++ b/modules/torrus/tests/discovery.pp
@@ -1,3 +1,3 @@
#
-include torrus::discovery
+include ::torrus::discovery
diff --git a/modules/torrus/tests/init.pp b/modules/torrus/tests/init.pp
index 0fb3397..a5d2c5a 100644
--- a/modules/torrus/tests/init.pp
+++ b/modules/torrus/tests/init.pp
@@ -1,3 +1,3 @@
#
-include torrus
+include ::torrus
diff --git a/modules/torrus/tests/web.pp b/modules/torrus/tests/web.pp
index d892fdf..131e92c 100644
--- a/modules/torrus/tests/web.pp
+++ b/modules/torrus/tests/web.pp
@@ -1,3 +1,3 @@
#
-include torrus::web
+include ::torrus::web
diff --git a/modules/torrus/tests/xmlconfig.pp
b/modules/torrus/tests/xmlconfig.pp
index 6043b4f..ef6b12a 100644
--- a/modules/torrus/tests/xmlconfig.pp
+++ b/modules/torrus/tests/xmlconfig.pp
@@ -1,3 +1,3 @@
#
-include torrus::xmlconfig
+include ::torrus::xmlconfig
--
To view, visit https://gerrit.wikimedia.org/r/332112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44d3a3fbaa9aa2958987d738dbfc8cde7a87fdb6
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
