Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/336720 )
Change subject: multiple roles: lint-fix standard/base::firewall includes
......................................................................
multiple roles: lint-fix standard/base::firewall includes
Bug: T93645
Change-Id: I9a507e93002bdb6036b1fb3e2b56f7b474abb91b
---
M modules/role/manifests/dataset/common.pp
M modules/role/manifests/etherpad/server.pp
M modules/role/manifests/gerrit/server.pp
M modules/role/manifests/icinga.pp
M modules/role/manifests/installserver/dhcp.pp
M modules/role/manifests/installserver/http.pp
M modules/role/manifests/installserver/preseed.pp
M modules/role/manifests/installserver/proxy.pp
M modules/role/manifests/installserver/tftp.pp
M modules/role/manifests/lists/server.pp
M modules/role/manifests/microsites/peopleweb.pp
M modules/role/manifests/otrs/webserver.pp
M modules/role/manifests/planet/venus.pp
M modules/role/manifests/pmacct.pp
M modules/role/manifests/racktables/server.pp
M modules/role/manifests/requesttracker/server.pp
M modules/role/manifests/requesttracker/upgradetest.pp
M modules/role/manifests/security/tools.pp
M modules/role/manifests/spare/system.pp
M modules/role/manifests/test/system.pp
M modules/role/manifests/wikimania_scholarships.pp
M modules/role/manifests/yubiauth/server.pp
22 files changed, 28 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/336720/1
diff --git a/modules/role/manifests/dataset/common.pp
b/modules/role/manifests/dataset/common.pp
index cce4209..e757295 100644
--- a/modules/role/manifests/dataset/common.pp
+++ b/modules/role/manifests/dataset/common.pp
@@ -1,5 +1,5 @@
class role::dataset::common {
- include standard
+ include ::standard
include base::firewall
ferm::service { 'nfs_rpc_mountd':
diff --git a/modules/role/manifests/etherpad/server.pp
b/modules/role/manifests/etherpad/server.pp
index 1a5be7b..7f84afb 100644
--- a/modules/role/manifests/etherpad/server.pp
+++ b/modules/role/manifests/etherpad/server.pp
@@ -1,6 +1,6 @@
# sets up an Etherpad lite server
class role::etherpad::server{
- include standard
+ include ::standard
include ::base::firewall
include passwords::etherpad_lite
diff --git a/modules/role/manifests/gerrit/server.pp
b/modules/role/manifests/gerrit/server.pp
index 25f3c5f..cbf0f81 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -4,7 +4,7 @@
class role::gerrit::server($ipv4, $ipv6 = undef, $bacula = undef) {
system::role { 'role::gerrit::server': description => 'Gerrit server' }
- include standard
+ include ::standard
include ::role::backup::host
include ::base::firewall
diff --git a/modules/role/manifests/icinga.pp b/modules/role/manifests/icinga.pp
index 4919ff4..63bd9e6 100644
--- a/modules/role/manifests/icinga.pp
+++ b/modules/role/manifests/icinga.pp
@@ -32,7 +32,7 @@
include netops::monitoring
include scap::dsh
include mysql
- include standard
+ include ::standard
include ::base::firewall
# Dependencies for the check_keystone_roles script
diff --git a/modules/role/manifests/installserver/dhcp.pp
b/modules/role/manifests/installserver/dhcp.pp
index f0865c1..4016b92 100644
--- a/modules/role/manifests/installserver/dhcp.pp
+++ b/modules/role/manifests/installserver/dhcp.pp
@@ -7,7 +7,7 @@
include install_server::dhcp_server
- include standard
+ include ::standard
include ::base::firewall
ferm::rule { 'dhcp':
diff --git a/modules/role/manifests/installserver/http.pp
b/modules/role/manifests/installserver/http.pp
index ed6145c..2b9eae1 100644
--- a/modules/role/manifests/installserver/http.pp
+++ b/modules/role/manifests/installserver/http.pp
@@ -7,7 +7,7 @@
include install_server::web_server
- include standard
+ include ::standard
include ::base::firewall
ferm::service { 'install_http':
diff --git a/modules/role/manifests/installserver/preseed.pp
b/modules/role/manifests/installserver/preseed.pp
index 7c56cd0..30723a1 100644
--- a/modules/role/manifests/installserver/preseed.pp
+++ b/modules/role/manifests/installserver/preseed.pp
@@ -1,7 +1,7 @@
# sets up preseeding dir and config on an install server
class role::installserver::preseed {
- include standard
+ include ::standard
include ::role::backup::host
include install_server::preseed_server
diff --git a/modules/role/manifests/installserver/proxy.pp
b/modules/role/manifests/installserver/proxy.pp
index 9515fb2..176a8a7 100644
--- a/modules/role/manifests/installserver/proxy.pp
+++ b/modules/role/manifests/installserver/proxy.pp
@@ -19,7 +19,7 @@
minute => '15',
}
- include standard
+ include ::standard
include ::base::firewall
ferm::service { 'proxy':
diff --git a/modules/role/manifests/installserver/tftp.pp
b/modules/role/manifests/installserver/tftp.pp
index 66dd3fd..bc02279 100644
--- a/modules/role/manifests/installserver/tftp.pp
+++ b/modules/role/manifests/installserver/tftp.pp
@@ -22,7 +22,7 @@
description => 'WMF TFTP server',
}
- include standard
+ include ::standard
include ::base::firewall
include ::role::backup::host
include install_server::tftp_server
diff --git a/modules/role/manifests/lists/server.pp
b/modules/role/manifests/lists/server.pp
index 95ec9db..89d5f3b 100644
--- a/modules/role/manifests/lists/server.pp
+++ b/modules/role/manifests/lists/server.pp
@@ -1,7 +1,7 @@
class role::lists::server {
include network::constants
include ::base::firewall
- include standard
+ include ::standard
system::role { 'role::lists::server':
description => 'Mailing list server',
diff --git a/modules/role/manifests/microsites/peopleweb.pp
b/modules/role/manifests/microsites/peopleweb.pp
index b6a9274..59989ca 100644
--- a/modules/role/manifests/microsites/peopleweb.pp
+++ b/modules/role/manifests/microsites/peopleweb.pp
@@ -1,7 +1,7 @@
# let users publish their own HTML in their home dirs
class role::microsites::peopleweb {
- include standard
+ include ::standard
include ::base::firewall
class { '::publichtml':
diff --git a/modules/role/manifests/otrs/webserver.pp
b/modules/role/manifests/otrs/webserver.pp
index 04a9943..1909f8c 100644
--- a/modules/role/manifests/otrs/webserver.pp
+++ b/modules/role/manifests/otrs/webserver.pp
@@ -8,8 +8,8 @@
system::role { 'role::otrs::webserver':
description => 'OTRS Web Application Server',
}
- include standard
- include base::firewall
+ include ::standard
+ include ::base::firewall
include passwords::mysql::otrs
include passwords::exim
diff --git a/modules/role/manifests/planet/venus.pp
b/modules/role/manifests/planet/venus.pp
index b6a8fc7..a22202d 100644
--- a/modules/role/manifests/planet/venus.pp
+++ b/modules/role/manifests/planet/venus.pp
@@ -2,7 +2,7 @@
class role::planet::venus {
- include base::firewall
+ include ::base::firewall
system::role { 'role::planet::venus': description => 'Planet (venus)
weblog aggregator' }
diff --git a/modules/role/manifests/pmacct.pp b/modules/role/manifests/pmacct.pp
index 5fafe7d..8326cc6 100644
--- a/modules/role/manifests/pmacct.pp
+++ b/modules/role/manifests/pmacct.pp
@@ -4,8 +4,8 @@
}
include ::pmacct
- include base::firewall
- include standard
+ include ::base::firewall
+ include ::standard
ferm::service { 'bgp':
proto => 'tcp',
diff --git a/modules/role/manifests/racktables/server.pp
b/modules/role/manifests/racktables/server.pp
index 31e2066..246e96c 100644
--- a/modules/role/manifests/racktables/server.pp
+++ b/modules/role/manifests/racktables/server.pp
@@ -10,8 +10,8 @@
system::role { 'role::racktables::server': description => 'Racktables
server' }
- include standard
- include base::firewall
+ include ::standard
+ include ::base::firewall
# be flexible about labs vs. prod
case $::realm {
diff --git a/modules/role/manifests/requesttracker/server.pp
b/modules/role/manifests/requesttracker/server.pp
index 1c0f841..427bded 100644
--- a/modules/role/manifests/requesttracker/server.pp
+++ b/modules/role/manifests/requesttracker/server.pp
@@ -3,7 +3,7 @@
system::role { 'requesttracker::server': description => 'RT server' }
include passwords::misc::rt
- include standard
+ include ::standard
include ::base::firewall
class { '::requesttracker':
diff --git a/modules/role/manifests/requesttracker/upgradetest.pp
b/modules/role/manifests/requesttracker/upgradetest.pp
index ad2c101..8dd345a 100644
--- a/modules/role/manifests/requesttracker/upgradetest.pp
+++ b/modules/role/manifests/requesttracker/upgradetest.pp
@@ -2,7 +2,7 @@
class role::requesttracker::upgradetest {
system::role { 'role::requesttracker::upgradetest': description => 'temp
test setup for RT migration to jessie' }
- include standard
+ include ::standard
include ::base::firewall
include rsync::server
diff --git a/modules/role/manifests/security/tools.pp
b/modules/role/manifests/security/tools.pp
index 6ed1d00..2559f8d 100644
--- a/modules/role/manifests/security/tools.pp
+++ b/modules/role/manifests/security/tools.pp
@@ -1,5 +1,5 @@
class role::security::tools {
- include standard
- include base::firewall
+ include ::standard
+ include ::base::firewall
}
diff --git a/modules/role/manifests/spare/system.pp
b/modules/role/manifests/spare/system.pp
index 57fc0d0..1741c1e 100644
--- a/modules/role/manifests/spare/system.pp
+++ b/modules/role/manifests/spare/system.pp
@@ -1,6 +1,6 @@
# This is a role for systems which are in the process of being reclaimed
# or decommissioned. IOW. the host once had a feature role assigned, but
-# currently no has it. If such hosts are simply reset to "include standard"
+# currently no has it. If such hosts are simply reset to "include ::standard"
# in site.pp, they are no longer matched by role-based grains for debdeploy.
#
# This role is entirely transient. Once a system has been reclaimed to spares
@@ -9,7 +9,7 @@
# filtertags: labs-project-puppet
class role::spare::system {
include standard
- include base::firewall
+ include ::base::firewall
system::role { 'role::spare::system': description => 'Unused spare system'
}
}
diff --git a/modules/role/manifests/test/system.pp
b/modules/role/manifests/test/system.pp
index b7ca7a1..12eaf4d 100644
--- a/modules/role/manifests/test/system.pp
+++ b/modules/role/manifests/test/system.pp
@@ -2,7 +2,7 @@
#
# filtertags: labs-project-puppet
class role::test::system {
- include standard
+ include ::standard
system::role { 'role::test::system': description => 'Unpuppetised system
for testing' }
}
diff --git a/modules/role/manifests/wikimania_scholarships.pp
b/modules/role/manifests/wikimania_scholarships.pp
index 4633929..bc0f3cf 100644
--- a/modules/role/manifests/wikimania_scholarships.pp
+++ b/modules/role/manifests/wikimania_scholarships.pp
@@ -4,7 +4,7 @@
#
class role::wikimania_scholarships {
- include base::firewall
+ include ::base::firewall
class { '::wikimania_scholarships':
hostname => 'scholarships.wikimedia.org',
diff --git a/modules/role/manifests/yubiauth/server.pp
b/modules/role/manifests/yubiauth/server.pp
index 017c214..ee2bd29 100644
--- a/modules/role/manifests/yubiauth/server.pp
+++ b/modules/role/manifests/yubiauth/server.pp
@@ -3,8 +3,8 @@
# This class configures a Yubi 2FA authentication server
#
class role::yubiauth::server {
- include standard
- include base::firewall
+ include ::standard
+ include ::base::firewall
include ::role::backup::host
include yubiauth::yhsm_daemon
--
To view, visit https://gerrit.wikimedia.org/r/336720
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a507e93002bdb6036b1fb3e2b56f7b474abb91b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
