Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337201 )
Change subject: lint: 'include base::firewall' -> 'include ::base::firewall'
......................................................................
lint: 'include base::firewall' -> 'include ::base::firewall'
Change-Id: I38d8459aa27450dc7934de7a9b1823e5328293be
---
M modules/role/manifests/aqs.pp
M modules/role/manifests/archiva.pp
M modules/role/manifests/authdns/server.pp
M modules/role/manifests/backup/host.pp
M modules/role/manifests/backup/storage.pp
M modules/role/manifests/beta/mediawiki.pp
M modules/role/manifests/builder.pp
M modules/role/manifests/cassandra.pp
M modules/role/manifests/docker/registry.pp
M modules/role/manifests/etcd.pp
M modules/role/manifests/eventbus/eventbus.pp
M modules/role/manifests/ganeti.pp
M modules/role/manifests/kubernetes/master.pp
M modules/role/manifests/kubernetes/worker.pp
M modules/role/manifests/labs/db/proxy.pp
M modules/role/manifests/labs/db/replica.pp
M modules/role/manifests/labs/novaproxy.pp
M modules/role/manifests/logging/mediawiki/udp2log.pp
M modules/role/manifests/logstash/collector.pp
M modules/role/manifests/logstash/elasticsearch.pp
M modules/role/manifests/mail/mx.pp
M modules/role/manifests/maps/server.pp
M modules/role/manifests/mariadb.pp
M modules/role/manifests/memcached.pp
M modules/role/manifests/mw_rc_irc.pp
M modules/role/manifests/ocg.pp
M modules/role/manifests/openldap/corp.pp
M modules/role/manifests/openldap/labs.pp
M modules/role/manifests/openldap/labtest.pp
M modules/role/manifests/osm/master.pp
M modules/role/manifests/osm/slave.pp
M modules/role/manifests/package/builder.pp
M modules/role/manifests/parsoid.pp
M modules/role/manifests/poolcounter/server.pp
M modules/role/manifests/postgres/master.pp
M modules/role/manifests/prometheus/global.pp
M modules/role/manifests/prometheus/ops.pp
M modules/role/manifests/puppet/self.pp
M modules/role/manifests/puppetmaster/backend.pp
M modules/role/manifests/puppetmaster/frontend.pp
M modules/role/manifests/pybaltest.pp
M modules/role/manifests/restbase/server.pp
M modules/role/manifests/sca.pp
M modules/role/manifests/scb.pp
M modules/role/manifests/snapshot/common.pp
M modules/role/manifests/statistics/cruncher.pp
M modules/role/manifests/swift/proxy.pp
M modules/role/manifests/swift/storage.pp
M modules/role/manifests/syslog/centralserver.pp
M modules/role/manifests/tendril.pp
M modules/role/manifests/thumbor/mediawiki.pp
M modules/role/manifests/toollabs/k8s/worker.pp
M modules/role/manifests/url_downloader.pp
M modules/role/manifests/wdqs.pp
54 files changed, 56 insertions(+), 56 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/role/manifests/aqs.pp b/modules/role/manifests/aqs.pp
index 7376a63..13f0296 100644
--- a/modules/role/manifests/aqs.pp
+++ b/modules/role/manifests/aqs.pp
@@ -13,7 +13,7 @@
include ::passwords::aqs
include standard
- include base::firewall
+ include ::base::firewall
#
# Set up Cassandra for AQS.
diff --git a/modules/role/manifests/archiva.pp
b/modules/role/manifests/archiva.pp
index 04404cd..e97f1f8 100644
--- a/modules/role/manifests/archiva.pp
+++ b/modules/role/manifests/archiva.pp
@@ -7,7 +7,7 @@
class role::archiva {
system::role { 'role::archiva': description => 'Apache Archiva Host' }
- include base::firewall
+ include ::base::firewall
require_package('openjdk-7-jdk')
diff --git a/modules/role/manifests/authdns/server.pp
b/modules/role/manifests/authdns/server.pp
index e99b5d4..dcecfa5 100644
--- a/modules/role/manifests/authdns/server.pp
+++ b/modules/role/manifests/authdns/server.pp
@@ -2,7 +2,7 @@
class role::authdns::server {
system::role { 'authdns': description => 'Authoritative DNS server' }
- include base::firewall
+ include ::base::firewall
include authdns::ganglia
include prometheus::node_gdnsd
include role::authdns::data
diff --git a/modules/role/manifests/backup/host.pp
b/modules/role/manifests/backup/host.pp
index 0580bc4..aaec25f 100644
--- a/modules/role/manifests/backup/host.pp
+++ b/modules/role/manifests/backup/host.pp
@@ -23,7 +23,7 @@
}
File <| tag == 'backup-motd' |>
- # If the machine includes base::firewall then let director connect to us
+ # If the machine includes ::base::firewall then let director connect to us
ferm::service { 'bacula-file-demon':
proto => 'tcp',
port => '9102',
diff --git a/modules/role/manifests/backup/storage.pp
b/modules/role/manifests/backup/storage.pp
index 3edfa4d..207231b 100644
--- a/modules/role/manifests/backup/storage.pp
+++ b/modules/role/manifests/backup/storage.pp
@@ -1,6 +1,6 @@
class role::backup::storage() {
include role::backup::config
- include base::firewall
+ include ::base::firewall
system::role { 'role::backup::storage': description => 'Backup Storage' }
diff --git a/modules/role/manifests/beta/mediawiki.pp
b/modules/role/manifests/beta/mediawiki.pp
index 299c583..f3ebc88 100644
--- a/modules/role/manifests/beta/mediawiki.pp
+++ b/modules/role/manifests/beta/mediawiki.pp
@@ -5,7 +5,7 @@
#
# filtertags: labs-project-deployment-prep
class role::beta::mediawiki {
- include base::firewall
+ include ::base::firewall
$ips =
join($network::constants::special_hosts[$::realm]['deployment_hosts'], ' ')
security::access::config { 'scap-allow-mwdeploy':
diff --git a/modules/role/manifests/builder.pp
b/modules/role/manifests/builder.pp
index 9aa897a..c752487 100644
--- a/modules/role/manifests/builder.pp
+++ b/modules/role/manifests/builder.pp
@@ -1,7 +1,7 @@
# filtertags: labs-project-packaging
class role::builder {
include standard
- include base::firewall
+ include ::base::firewall
include role::package::builder
include profile::docker::storage::loopback
include profile::docker::engine
diff --git a/modules/role/manifests/cassandra.pp
b/modules/role/manifests/cassandra.pp
index de55d7e..be0ce07 100644
--- a/modules/role/manifests/cassandra.pp
+++ b/modules/role/manifests/cassandra.pp
@@ -3,7 +3,7 @@
# filtertags: labs-project-deployment-prep
class role::cassandra {
include ::passwords::cassandra
- include base::firewall
+ include ::base::firewall
# Parameters to be set by Hiera
class { '::cassandra': }
diff --git a/modules/role/manifests/docker/registry.pp
b/modules/role/manifests/docker/registry.pp
index 91eee10..0f37ac5 100644
--- a/modules/role/manifests/docker/registry.pp
+++ b/modules/role/manifests/docker/registry.pp
@@ -1,5 +1,5 @@
class role::docker::registry {
include standard
- include base::firewall
+ include ::base::firewall
include profile::docker::registry
}
diff --git a/modules/role/manifests/etcd.pp b/modules/role/manifests/etcd.pp
index d7afd10..6396968 100644
--- a/modules/role/manifests/etcd.pp
+++ b/modules/role/manifests/etcd.pp
@@ -7,7 +7,7 @@
}
require standard
- include base::firewall
+ include ::base::firewall
include etcd
include etcd::monitoring
diff --git a/modules/role/manifests/eventbus/eventbus.pp
b/modules/role/manifests/eventbus/eventbus.pp
index 218b798..9433b4e 100644
--- a/modules/role/manifests/eventbus/eventbus.pp
+++ b/modules/role/manifests/eventbus/eventbus.pp
@@ -10,7 +10,7 @@
#
# filtertags: labs-project-deployment-prep
class role::eventbus::eventbus {
- include base::firewall
+ include ::base::firewall
require ::eventschemas
# for /srv/log dir creation
diff --git a/modules/role/manifests/ganeti.pp b/modules/role/manifests/ganeti.pp
index 5b90054..bc1649b 100644
--- a/modules/role/manifests/ganeti.pp
+++ b/modules/role/manifests/ganeti.pp
@@ -36,7 +36,7 @@
# If ganeti_cluster fact is not defined, the node has not been added to a
# cluster yet, so don't monitor and don't setup a firewall
if $::ganeti_cluster {
- include base::firewall
+ include ::base::firewall
# Interpolate the ganeti_cluster fact to get the list of nodes in a
# cluster
$ganeti_nodes = hiera("ganeti::${::ganeti_cluster}::nodes")
diff --git a/modules/role/manifests/kubernetes/master.pp
b/modules/role/manifests/kubernetes/master.pp
index d9338e2..8843a72 100644
--- a/modules/role/manifests/kubernetes/master.pp
+++ b/modules/role/manifests/kubernetes/master.pp
@@ -1,6 +1,6 @@
class role::kubernetes::master {
include standard
- include base::firewall
+ include ::base::firewall
# Sets up docker on the machine
include ::profile::kubernetes::master
diff --git a/modules/role/manifests/kubernetes/worker.pp
b/modules/role/manifests/kubernetes/worker.pp
index db80927..0eaf7b6 100644
--- a/modules/role/manifests/kubernetes/worker.pp
+++ b/modules/role/manifests/kubernetes/worker.pp
@@ -1,7 +1,7 @@
# filtertags: labs-project-packaging
class role::kubernetes::worker {
include standard
- include base::firewall
+ include ::base::firewall
# Sets up docker on the machine
include ::profile::docker::storage
diff --git a/modules/role/manifests/labs/db/proxy.pp
b/modules/role/manifests/labs/db/proxy.pp
index 80d53fd..b30352d 100644
--- a/modules/role/manifests/labs/db/proxy.pp
+++ b/modules/role/manifests/labs/db/proxy.pp
@@ -9,7 +9,7 @@
include standard
include passwords::labs::db::proxy
- include base::firewall
+ include ::base::firewall
$admin_user = $passwords::labs::db::proxy::admin_user
$admin_password = $passwords::labs::db::proxy::admin_password
diff --git a/modules/role/manifests/labs/db/replica.pp
b/modules/role/manifests/labs/db/replica.pp
index 4408d3e..8286a90 100644
--- a/modules/role/manifests/labs/db/replica.pp
+++ b/modules/role/manifests/labs/db/replica.pp
@@ -12,7 +12,7 @@
package => 'wmf-mariadb101',
}
include role::mariadb::monitor
- include base::firewall
+ include ::base::firewall
ferm::service{ 'mariadb_internal':
proto => 'tcp',
diff --git a/modules/role/manifests/labs/novaproxy.pp
b/modules/role/manifests/labs/novaproxy.pp
index 606e7ef..550113f 100644
--- a/modules/role/manifests/labs/novaproxy.pp
+++ b/modules/role/manifests/labs/novaproxy.pp
@@ -7,7 +7,7 @@
$active_proxy,
$use_ssl = true,
) {
- include base::firewall
+ include ::base::firewall
$proxy_nodes = join($all_proxies, ' ')
# Open up redis to all proxies!
diff --git a/modules/role/manifests/logging/mediawiki/udp2log.pp
b/modules/role/manifests/logging/mediawiki/udp2log.pp
index 264e681..41dc34d 100644
--- a/modules/role/manifests/logging/mediawiki/udp2log.pp
+++ b/modules/role/manifests/logging/mediawiki/udp2log.pp
@@ -13,7 +13,7 @@
description => 'MediaWiki log collector',
}
- include base::firewall
+ include ::base::firewall
# Rsync archived slow-parse logs to dumps.wikimedia.org.
# These are available for download at
http://dumps.wikimedia.org/other/slow-parse/
diff --git a/modules/role/manifests/logstash/collector.pp
b/modules/role/manifests/logstash/collector.pp
index 53f3c8a..a7a11a6 100644
--- a/modules/role/manifests/logstash/collector.pp
+++ b/modules/role/manifests/logstash/collector.pp
@@ -13,7 +13,7 @@
) {
include ::role::logstash::elasticsearch
include ::logstash
- include base::firewall
+ include ::base::firewall
nrpe::monitor_service { 'logstash':
description => 'logstash process',
diff --git a/modules/role/manifests/logstash/elasticsearch.pp
b/modules/role/manifests/logstash/elasticsearch.pp
index afa5f83..7547ab6 100644
--- a/modules/role/manifests/logstash/elasticsearch.pp
+++ b/modules/role/manifests/logstash/elasticsearch.pp
@@ -7,7 +7,7 @@
include standard
include ::elasticsearch::nagios::check
include ::elasticsearch::monitor::diamond
- include base::firewall
+ include ::base::firewall
if $::standard::has_ganglia {
include ::elasticsearch::ganglia
diff --git a/modules/role/manifests/mail/mx.pp
b/modules/role/manifests/mail/mx.pp
index b105a20..e46d7c6 100644
--- a/modules/role/manifests/mail/mx.pp
+++ b/modules/role/manifests/mail/mx.pp
@@ -8,7 +8,7 @@
) {
include network::constants
include privateexim::aliases::private
- include base::firewall
+ include ::base::firewall
system::role { 'role::mail::mx':
description => 'Mail router',
diff --git a/modules/role/manifests/maps/server.pp
b/modules/role/manifests/maps/server.pp
index e76c984..770e11e 100644
--- a/modules/role/manifests/maps/server.pp
+++ b/modules/role/manifests/maps/server.pp
@@ -2,7 +2,7 @@
# the services kartotherian and tilerator
class role::maps::server {
include standard
- include base::firewall
+ include ::base::firewall
include ::cassandra
include ::cassandra::metrics
include ::cassandra::logging
diff --git a/modules/role/manifests/mariadb.pp
b/modules/role/manifests/mariadb.pp
index 44e7921..2a7b5b1 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -541,7 +541,7 @@
}
include standard
- include base::firewall
+ include ::base::firewall
include role::mariadb::monitor
include passwords::misc::scripts
include role::mariadb::ferm
@@ -710,7 +710,7 @@
include standard
include passwords::misc::scripts
- include base::firewall
+ include ::base::firewall
include role::mariadb::ferm
include role::labs::db::common
include role::labs::db::check_private_data
@@ -764,7 +764,7 @@
include role::mariadb::monitor
include passwords::misc::scripts
include role::mariadb::ferm
- include base::firewall
+ include ::base::firewall
include role::labs::db::common
include role::labs::db::views
include role::labs::db::check_private_data
diff --git a/modules/role/manifests/memcached.pp
b/modules/role/manifests/memcached.pp
index 6ec7096..096f760 100644
--- a/modules/role/manifests/memcached.pp
+++ b/modules/role/manifests/memcached.pp
@@ -6,7 +6,7 @@
include standard
include base::mysterious_sysctl
- include base::firewall
+ include ::base::firewall
include passwords::redis
$memcached_size = $::realm ? {
diff --git a/modules/role/manifests/mw_rc_irc.pp
b/modules/role/manifests/mw_rc_irc.pp
index 113e636..decd245 100644
--- a/modules/role/manifests/mw_rc_irc.pp
+++ b/modules/role/manifests/mw_rc_irc.pp
@@ -4,7 +4,7 @@
system::role { 'role::mw_rc_irc': description => 'MW Changes IRC Broadcast
Server' }
include standard
- include base::firewall
+ include ::base::firewall
include passwords::udpmxircecho
$udpmxircecho_pass = $passwords::udpmxircecho::udpmxircecho_pass
diff --git a/modules/role/manifests/ocg.pp b/modules/role/manifests/ocg.pp
index 56d5ed0..600c235 100644
--- a/modules/role/manifests/ocg.pp
+++ b/modules/role/manifests/ocg.pp
@@ -4,7 +4,7 @@
#
# filtertags: labs-project-deployment-prep labs-project-ocg
class role::ocg {
- include base::firewall
+ include ::base::firewall
include standard
# size of tmpfs filesystem
diff --git a/modules/role/manifests/openldap/corp.pp
b/modules/role/manifests/openldap/corp.pp
index bb76bff..d53cd5b 100644
--- a/modules/role/manifests/openldap/corp.pp
+++ b/modules/role/manifests/openldap/corp.pp
@@ -3,7 +3,7 @@
# vim: set ts=4 et sw=4:
class role::openldap::corp {
include passwords::openldap::corp
- include base::firewall
+ include ::base::firewall
system::role { 'role::openldap::corp':
description => 'Corp OIT openldap Mirror server'
diff --git a/modules/role/manifests/openldap/labs.pp
b/modules/role/manifests/openldap/labs.pp
index ba95b10..9bd6634 100644
--- a/modules/role/manifests/openldap/labs.pp
+++ b/modules/role/manifests/openldap/labs.pp
@@ -2,7 +2,7 @@
class role::openldap::labs {
include passwords::openldap::labs
- include base::firewall
+ include ::base::firewall
$ldapconfig = hiera_hash('labsldapconfig', {})
$ldap_labs_hostname = $ldapconfig['hostname']
diff --git a/modules/role/manifests/openldap/labtest.pp
b/modules/role/manifests/openldap/labtest.pp
index d5951d3..43b3a3e 100644
--- a/modules/role/manifests/openldap/labtest.pp
+++ b/modules/role/manifests/openldap/labtest.pp
@@ -3,7 +3,7 @@
class role::openldap::labtest {
include passwords::openldap::labtest
- include base::firewall
+ include ::base::firewall
$ldapconfig = hiera_hash('labsldapconfig', {})
$ldap_labs_hostname = $ldapconfig['hostname']
diff --git a/modules/role/manifests/osm/master.pp
b/modules/role/manifests/osm/master.pp
index b85d0c3..e44be3d 100644
--- a/modules/role/manifests/osm/master.pp
+++ b/modules/role/manifests/osm/master.pp
@@ -21,7 +21,7 @@
include postgresql::postgis
include osm
include passwords::osm
- include base::firewall
+ include ::base::firewall
class { 'postgresql::master':
diff --git a/modules/role/manifests/osm/slave.pp
b/modules/role/manifests/osm/slave.pp
index f992400..f115fa2 100644
--- a/modules/role/manifests/osm/slave.pp
+++ b/modules/role/manifests/osm/slave.pp
@@ -2,7 +2,7 @@
include role::osm::common
include postgresql::postgis
include passwords::osm
- include base::firewall
+ include ::base::firewall
# Note: This is here to illustrate the fact that the slave is expected to
# have the same dbs as the master.
#postgresql::spatialdb { 'gis': }
diff --git a/modules/role/manifests/package/builder.pp
b/modules/role/manifests/package/builder.pp
index a853841..be7a392 100644
--- a/modules/role/manifests/package/builder.pp
+++ b/modules/role/manifests/package/builder.pp
@@ -5,7 +5,7 @@
# filtertags: labs-project-deployment-prep labs-project-packaging
labs-project-tools
class role::package::builder {
include ::package_builder
- include base::firewall
+ include ::base::firewall
system::role { 'role::package::builder':
description => 'Debian package builder'
diff --git a/modules/role/manifests/parsoid.pp
b/modules/role/manifests/parsoid.pp
index b424614..18591b2 100644
--- a/modules/role/manifests/parsoid.pp
+++ b/modules/role/manifests/parsoid.pp
@@ -7,7 +7,7 @@
description => "Parsoid ${::realm}"
}
- include base::firewall
+ include ::base::firewall
if hiera('has_lvs', true) {
include role::lvs::realserver
diff --git a/modules/role/manifests/poolcounter/server.pp
b/modules/role/manifests/poolcounter/server.pp
index e5058a4..37dad8d 100644
--- a/modules/role/manifests/poolcounter/server.pp
+++ b/modules/role/manifests/poolcounter/server.pp
@@ -1,7 +1,7 @@
# filtertags: labs-project-deployment-prep
class role::poolcounter::server {
include ::poolcounter
- include base::firewall
+ include ::base::firewall
system::role { 'role::poolcounter':
description => 'PoolCounter server',
diff --git a/modules/role/manifests/postgres/master.pp
b/modules/role/manifests/postgres/master.pp
index 0105419..1a5b0bb 100644
--- a/modules/role/manifests/postgres/master.pp
+++ b/modules/role/manifests/postgres/master.pp
@@ -2,7 +2,7 @@
include role::postgres::common
include ::postgresql::postgis
include ::passwords::postgres
- include base::firewall
+ include ::base::firewall
class { 'postgresql::master':
includes => 'tuning.conf',
diff --git a/modules/role/manifests/prometheus/global.pp
b/modules/role/manifests/prometheus/global.pp
index 7e4684f..4637eca 100644
--- a/modules/role/manifests/prometheus/global.pp
+++ b/modules/role/manifests/prometheus/global.pp
@@ -1,5 +1,5 @@
class role::prometheus::global {
- include base::firewall
+ include ::base::firewall
# Pull selected metrics from all DC-local Prometheus servers.
$federation_jobs = [
diff --git a/modules/role/manifests/prometheus/ops.pp
b/modules/role/manifests/prometheus/ops.pp
index f4770fa..5acb5fb 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -3,7 +3,7 @@
#
# filtertags: labs-project-monitoring
class role::prometheus::ops {
- include base::firewall
+ include ::base::firewall
$targets_path = '/srv/prometheus/ops/targets'
$storage_retention = hiera('prometheus::server::storage_retention',
'4320h0m0s')
diff --git a/modules/role/manifests/puppet/self.pp
b/modules/role/manifests/puppet/self.pp
index 5a42061..4c32133 100644
--- a/modules/role/manifests/puppet/self.pp
+++ b/modules/role/manifests/puppet/self.pp
@@ -46,7 +46,7 @@
include puppetmaster::gitsync
}
- # Allow access to the Puppetmaster when base::firewall is applied
+ # Allow access to the Puppetmaster when ::base::firewall is applied
ferm::service { 'puppetmaster-self':
proto => 'tcp',
port => 8140,
diff --git a/modules/role/manifests/puppetmaster/backend.pp
b/modules/role/manifests/puppetmaster/backend.pp
index c511f3e..d5717f3 100644
--- a/modules/role/manifests/puppetmaster/backend.pp
+++ b/modules/role/manifests/puppetmaster/backend.pp
@@ -1,7 +1,7 @@
# vim: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab textwidth=80 smarttab
class role::puppetmaster::backend {
- include base::firewall
+ include ::base::firewall
system::role { 'puppetmaster':
description => 'Puppetmaster backend'
diff --git a/modules/role/manifests/puppetmaster/frontend.pp
b/modules/role/manifests/puppetmaster/frontend.pp
index da5acbe..3ff4775 100644
--- a/modules/role/manifests/puppetmaster/frontend.pp
+++ b/modules/role/manifests/puppetmaster/frontend.pp
@@ -1,7 +1,7 @@
# vim: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab textwidth=80 smarttab
class role::puppetmaster::frontend {
- include base::firewall
+ include ::base::firewall
include role::backup::host
backup::set { 'var-lib-puppet-ssl': }
diff --git a/modules/role/manifests/pybaltest.pp
b/modules/role/manifests/pybaltest.pp
index cf76333..ec26e88 100644
--- a/modules/role/manifests/pybaltest.pp
+++ b/modules/role/manifests/pybaltest.pp
@@ -3,7 +3,7 @@
description => 'pybal testing/development'
}
- include base::firewall
+ include ::base::firewall
$pybaltest_hosts_ferm = join(hiera('pybaltest::hosts'), ' ')
ferm::service { 'pybaltest-http':
diff --git a/modules/role/manifests/restbase/server.pp
b/modules/role/manifests/restbase/server.pp
index f394a54..dcacda1 100644
--- a/modules/role/manifests/restbase/server.pp
+++ b/modules/role/manifests/restbase/server.pp
@@ -6,7 +6,7 @@
system::role { 'restbase': description => "Restbase ${::realm}" }
include ::passwords::cassandra
- include base::firewall
+ include ::base::firewall
include standard
include ::restbase
diff --git a/modules/role/manifests/sca.pp b/modules/role/manifests/sca.pp
index 17ef84a..2dca61f 100644
--- a/modules/role/manifests/sca.pp
+++ b/modules/role/manifests/sca.pp
@@ -4,7 +4,7 @@
include role::zotero
include standard
- include base::firewall
+ include ::base::firewall
if $::realm == 'production' {
include ::lvs::realserver
}
diff --git a/modules/role/manifests/scb.pp b/modules/role/manifests/scb.pp
index 9004011..959a7f3 100644
--- a/modules/role/manifests/scb.pp
+++ b/modules/role/manifests/scb.pp
@@ -15,7 +15,7 @@
include role::trendingedits
include standard
- include base::firewall
+ include ::base::firewall
if hiera('has_lvs', true) {
include role::lvs::realserver
diff --git a/modules/role/manifests/snapshot/common.pp
b/modules/role/manifests/snapshot/common.pp
index e0ede90..07ece9e 100644
--- a/modules/role/manifests/snapshot/common.pp
+++ b/modules/role/manifests/snapshot/common.pp
@@ -1,7 +1,7 @@
class role::snapshot::common {
include ::dataset::user
include standard
- include base::firewall
+ include ::base::firewall
# mw packages and dependencies, dataset server nfs mount,
# config files, stages files, dblists, html templates
diff --git a/modules/role/manifests/statistics/cruncher.pp
b/modules/role/manifests/statistics/cruncher.pp
index 0688451..64c40d3 100644
--- a/modules/role/manifests/statistics/cruncher.pp
+++ b/modules/role/manifests/statistics/cruncher.pp
@@ -5,7 +5,7 @@
}
include standard
- include base::firewall
+ include ::base::firewall
include role::backup::host
backup::set { 'home' : }
diff --git a/modules/role/manifests/swift/proxy.pp
b/modules/role/manifests/swift/proxy.pp
index fef1bf5..9e7a044 100644
--- a/modules/role/manifests/swift/proxy.pp
+++ b/modules/role/manifests/swift/proxy.pp
@@ -5,7 +5,7 @@
}
include standard
- include base::firewall
+ include ::base::firewall
include ::swift::params
include ::swift
include ::swift::ring
diff --git a/modules/role/manifests/swift/storage.pp
b/modules/role/manifests/swift/storage.pp
index 449b3fd..0a3d479 100644
--- a/modules/role/manifests/swift/storage.pp
+++ b/modules/role/manifests/swift/storage.pp
@@ -5,7 +5,7 @@
}
include standard
- include base::firewall
+ include ::base::firewall
include ::swift::params
include ::swift
include ::swift::ring
diff --git a/modules/role/manifests/syslog/centralserver.pp
b/modules/role/manifests/syslog/centralserver.pp
index c8be8bc..849229e 100644
--- a/modules/role/manifests/syslog/centralserver.pp
+++ b/modules/role/manifests/syslog/centralserver.pp
@@ -4,7 +4,7 @@
#
class role::syslog::centralserver {
- include base::firewall
+ include ::base::firewall
system::role { 'role::syslog::centralserver':
description => 'Central syslog server'
diff --git a/modules/role/manifests/tendril.pp
b/modules/role/manifests/tendril.pp
index 8344fe1..aaf7d74 100644
--- a/modules/role/manifests/tendril.pp
+++ b/modules/role/manifests/tendril.pp
@@ -2,7 +2,7 @@
# tendril: MariaDB Analytics
class role::tendril {
- include base::firewall
+ include ::base::firewall
include standard
system::role { 'role::tendril': description => 'tendril server' }
diff --git a/modules/role/manifests/thumbor/mediawiki.pp
b/modules/role/manifests/thumbor/mediawiki.pp
index 61908f7..3c99af2 100644
--- a/modules/role/manifests/thumbor/mediawiki.pp
+++ b/modules/role/manifests/thumbor/mediawiki.pp
@@ -5,7 +5,7 @@
# filtertags: labs-project-deployment-prep
class role::thumbor::mediawiki {
- include base::firewall
+ include ::base::firewall
include role::statsite
diff --git a/modules/role/manifests/toollabs/k8s/worker.pp
b/modules/role/manifests/toollabs/k8s/worker.pp
index f0e0847..9a78b2b 100644
--- a/modules/role/manifests/toollabs/k8s/worker.pp
+++ b/modules/role/manifests/toollabs/k8s/worker.pp
@@ -1,6 +1,6 @@
# filtertags: labs-project-tools
class role::toollabs::k8s::worker {
- # NOTE: No base::firewall!
+ # NOTE: No ::base::firewall!
# ferm and kube-proxy will conflict
include ::toollabs::infrastructure
diff --git a/modules/role/manifests/url_downloader.pp
b/modules/role/manifests/url_downloader.pp
index 6d700b1..8b528b8 100644
--- a/modules/role/manifests/url_downloader.pp
+++ b/modules/role/manifests/url_downloader.pp
@@ -29,7 +29,7 @@
}
include network::constants
include standard
- include base::firewall
+ include ::base::firewall
$url_downloader_ip = hiera('url_downloader_ip', $::ipaddress)
$url_downloader_port = hiera('url_downloader_port', 8080)
diff --git a/modules/role/manifests/wdqs.pp b/modules/role/manifests/wdqs.pp
index c328e8f..06b5d3d 100644
--- a/modules/role/manifests/wdqs.pp
+++ b/modules/role/manifests/wdqs.pp
@@ -5,7 +5,7 @@
# filtertags: labs-project-wikidata-query
class role::wdqs {
include standard
- include base::firewall
+ include ::base::firewall
$nagios_contact_group = 'admins,wdqs-admins'
--
To view, visit https://gerrit.wikimedia.org/r/337201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I38d8459aa27450dc7934de7a9b1823e5328293be
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Juniorsys <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
