Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/337202 )
Change subject: lint: 'include standard' -> 'include ::standard'
......................................................................
lint: 'include standard' -> 'include ::standard'
Change-Id: If0a848c683b7b149d86a2afbc67694d7d989b376
---
M modules/role/manifests/aqs.pp
M modules/role/manifests/builder.pp
M modules/role/manifests/cache/base.pp
M modules/role/manifests/debdeploy/master.pp
M modules/role/manifests/deployment/server.pp
M modules/role/manifests/docker/registry.pp
M modules/role/manifests/kubernetes/master.pp
M modules/role/manifests/kubernetes/worker.pp
M modules/role/manifests/labs/db/master.pp
M modules/role/manifests/labs/db/proxy.pp
M modules/role/manifests/labs/db/replica.pp
M modules/role/manifests/labs/db/slave.pp
M modules/role/manifests/labs/instance.pp
M modules/role/manifests/logstash/elasticsearch.pp
M modules/role/manifests/lvs/balancer.pp
M modules/role/manifests/maps/server.pp
M modules/role/manifests/mariadb.pp
M modules/role/manifests/mariadb/dbstore.pp
M modules/role/manifests/mariadb/dbstore2.pp
M modules/role/manifests/memcached.pp
M modules/role/manifests/mw_rc_irc.pp
M modules/role/manifests/ntp.pp
M modules/role/manifests/ocg.pp
M modules/role/manifests/osm/common.pp
M modules/role/manifests/postgres/common.pp
M modules/role/manifests/puppetmaster/puppetdb.pp
M modules/role/manifests/rcstream.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/spare/system.pp
M modules/role/manifests/statistics/cruncher.pp
M modules/role/manifests/swift/proxy.pp
M modules/role/manifests/swift/stats_reporter.pp
M modules/role/manifests/swift/storage.pp
M modules/role/manifests/tendril.pp
M modules/role/manifests/url_downloader.pp
M modules/role/manifests/wdqs.pp
M modules/standard/manifests/init.pp
M modules/wmflib/lib/puppet/parser/functions/role.rb
41 files changed, 54 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/337202/1
diff --git a/modules/role/manifests/aqs.pp b/modules/role/manifests/aqs.pp
index 7376a63..e2c5e46 100644
--- a/modules/role/manifests/aqs.pp
+++ b/modules/role/manifests/aqs.pp
@@ -12,7 +12,7 @@
include ::passwords::aqs
- include standard
+ include ::standard
include base::firewall
#
diff --git a/modules/role/manifests/builder.pp
b/modules/role/manifests/builder.pp
index 9aa897a..6f3eb75 100644
--- a/modules/role/manifests/builder.pp
+++ b/modules/role/manifests/builder.pp
@@ -1,6 +1,6 @@
# filtertags: labs-project-packaging
class role::builder {
- include standard
+ include ::standard
include base::firewall
include role::package::builder
include profile::docker::storage::loopback
diff --git a/modules/role/manifests/cache/base.pp
b/modules/role/manifests/cache/base.pp
index 462bac8..952590e 100644
--- a/modules/role/manifests/cache/base.pp
+++ b/modules/role/manifests/cache/base.pp
@@ -4,7 +4,7 @@
$purge_host_not_upload_re = '^(?!upload\.wikimedia\.org)',
$storage_parts = ['sda3', 'sdb3'],
) {
- include standard
+ include ::standard
include nrpe
include lvs::configuration
include network::constants
diff --git a/modules/role/manifests/debdeploy/master.pp
b/modules/role/manifests/debdeploy/master.pp
index cbcdcc4..113038d 100644
--- a/modules/role/manifests/debdeploy/master.pp
+++ b/modules/role/manifests/debdeploy/master.pp
@@ -1,5 +1,5 @@
class role::debdeploy::master {
- include standard
+ include ::standard
system::role { 'role::debdeploymaster':
description => 'debdeploy master',
diff --git a/modules/role/manifests/deployment/server.pp
b/modules/role/manifests/deployment/server.pp
index 0cd4c36..5b56833 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -4,7 +4,7 @@
$deployment_group = 'wikidev',
) {
- include standard
+ include ::standard
$base_path = '/srv/deployment'
include role::deployment::mediawiki
diff --git a/modules/role/manifests/docker/registry.pp
b/modules/role/manifests/docker/registry.pp
index 91eee10..b81bbcd 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 ::standard
include base::firewall
include profile::docker::registry
}
diff --git a/modules/role/manifests/kubernetes/master.pp
b/modules/role/manifests/kubernetes/master.pp
index d9338e2..20daeb6 100644
--- a/modules/role/manifests/kubernetes/master.pp
+++ b/modules/role/manifests/kubernetes/master.pp
@@ -1,5 +1,5 @@
class role::kubernetes::master {
- include standard
+ include ::standard
include base::firewall
# Sets up docker on the machine
diff --git a/modules/role/manifests/kubernetes/worker.pp
b/modules/role/manifests/kubernetes/worker.pp
index db80927..6c553bb 100644
--- a/modules/role/manifests/kubernetes/worker.pp
+++ b/modules/role/manifests/kubernetes/worker.pp
@@ -1,6 +1,6 @@
# filtertags: labs-project-packaging
class role::kubernetes::worker {
- include standard
+ include ::standard
include base::firewall
# Sets up docker on the machine
diff --git a/modules/role/manifests/labs/db/master.pp
b/modules/role/manifests/labs/db/master.pp
index 3641dab..873ee98 100644
--- a/modules/role/manifests/labs/db/master.pp
+++ b/modules/role/manifests/labs/db/master.pp
@@ -4,7 +4,7 @@
description => 'Labs user database master',
}
- include standard
+ include ::standard
class { 'mariadb::packages_wmf':
mariadb10 => false
}
diff --git a/modules/role/manifests/labs/db/proxy.pp
b/modules/role/manifests/labs/db/proxy.pp
index 80d53fd..fdcb819 100644
--- a/modules/role/manifests/labs/db/proxy.pp
+++ b/modules/role/manifests/labs/db/proxy.pp
@@ -7,7 +7,7 @@
description => 'LabsDB proxy',
}
- include standard
+ include ::standard
include passwords::labs::db::proxy
include base::firewall
diff --git a/modules/role/manifests/labs/db/replica.pp
b/modules/role/manifests/labs/db/replica.pp
index 4408d3e..3f4b737 100644
--- a/modules/role/manifests/labs/db/replica.pp
+++ b/modules/role/manifests/labs/db/replica.pp
@@ -4,7 +4,7 @@
description => 'Labs replica database',
}
- include standard
+ include ::standard
class { 'mariadb::packages_wmf':
package => 'wmf-mariadb101',
}
diff --git a/modules/role/manifests/labs/db/slave.pp
b/modules/role/manifests/labs/db/slave.pp
index 6834cba..ae430ef 100644
--- a/modules/role/manifests/labs/db/slave.pp
+++ b/modules/role/manifests/labs/db/slave.pp
@@ -4,7 +4,7 @@
description => 'Labs user database slave',
}
- include standard
+ include ::standard
include mariadb::packages_wmf
include mariadb::service
include role::mariadb::monitor
diff --git a/modules/role/manifests/labs/instance.pp
b/modules/role/manifests/labs/instance.pp
index adb5640..364798a 100644
--- a/modules/role/manifests/labs/instance.pp
+++ b/modules/role/manifests/labs/instance.pp
@@ -1,6 +1,6 @@
class role::labs::instance {
- include standard
+ include ::standard
include profile::base::labs
include sudo
include base::instance_upstarts
diff --git a/modules/role/manifests/logstash/elasticsearch.pp
b/modules/role/manifests/logstash/elasticsearch.pp
index afa5f83..6ca8c0f 100644
--- a/modules/role/manifests/logstash/elasticsearch.pp
+++ b/modules/role/manifests/logstash/elasticsearch.pp
@@ -4,7 +4,7 @@
# Provisions Elasticsearch backend node for a Logstash cluster.
#
class role::logstash::elasticsearch {
- include standard
+ include ::standard
include ::elasticsearch::nagios::check
include ::elasticsearch::monitor::diamond
include base::firewall
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index 35c52d4..a62fd5e 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -104,7 +104,7 @@
],
}
- include standard
+ include ::standard
salt::grain { 'lvs':
grain => 'lvs',
diff --git a/modules/role/manifests/maps/server.pp
b/modules/role/manifests/maps/server.pp
index e76c984..1dc0ea5 100644
--- a/modules/role/manifests/maps/server.pp
+++ b/modules/role/manifests/maps/server.pp
@@ -1,7 +1,7 @@
# This role class sets up a maps server with
# the services kartotherian and tilerator
class role::maps::server {
- include standard
+ include ::standard
include base::firewall
include ::cassandra
include ::cassandra::metrics
diff --git a/modules/role/manifests/mariadb.pp
b/modules/role/manifests/mariadb.pp
index 44e7921..46b16d8 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -8,7 +8,7 @@
description => 'database server',
}
- include standard
+ include ::standard
include ::mariadb
}
@@ -222,7 +222,7 @@
false => 'slave',
}
- include standard
+ include ::standard
include role::mariadb::monitor
include passwords::misc::scripts
include role::mariadb::ferm
@@ -272,7 +272,7 @@
description => "Misc Services Database ${shard} (phabricator)",
}
- include standard
+ include ::standard
include mariadb::packages_wmf
include mariadb::service
@@ -370,7 +370,7 @@
false => 'slave',
}
- include standard
+ include ::standard
include role::mariadb::monitor::dba
include passwords::misc::scripts
include role::mariadb::ferm
@@ -422,7 +422,7 @@
description => 'beta cluster database server',
}
- include standard
+ include ::standard
include mariadb::packages_wmf
include passwords::misc::scripts
@@ -467,7 +467,7 @@
include mariadb::packages_wmf
include mariadb::service
- include standard
+ include ::standard
include role::mariadb::monitor::dba
include passwords::misc::scripts
include role::mariadb::ferm
@@ -540,7 +540,7 @@
description => "Core DB Server ${shard}",
}
- include standard
+ include ::standard
include base::firewall
include role::mariadb::monitor
include passwords::misc::scripts
@@ -620,7 +620,7 @@
description => 'Sanitarium DB Server',
}
- include standard
+ include ::standard
include passwords::misc::scripts
class { 'role::mariadb::groups':
mysql_group => 'labs',
@@ -708,7 +708,7 @@
description => 'Sanitarium DB Server',
}
- include standard
+ include ::standard
include passwords::misc::scripts
include base::firewall
include role::mariadb::ferm
@@ -760,7 +760,7 @@
description => 'Labs DB Slave',
}
- include standard
+ include ::standard
include role::mariadb::monitor
include passwords::misc::scripts
include role::mariadb::ferm
@@ -814,7 +814,7 @@
description => 'Wikitech Database',
}
- include standard
+ include ::standard
include role::mariadb::grants::wikitech
include role::mariadb::monitor
include passwords::misc::scripts
@@ -858,7 +858,7 @@
description => "DB Proxy ${shard}",
}
- include standard
+ include ::standard
package { [
'mysql-client',
@@ -921,7 +921,7 @@
$shard,
) {
- include standard
+ include ::standard
include role::mariadb::monitor
include role::mariadb::ferm
diff --git a/modules/role/manifests/mariadb/dbstore.pp
b/modules/role/manifests/mariadb/dbstore.pp
index 5ef0594..a042403 100644
--- a/modules/role/manifests/mariadb/dbstore.pp
+++ b/modules/role/manifests/mariadb/dbstore.pp
@@ -12,7 +12,7 @@
include mariadb::packages_wmf
include mariadb::service
- include standard
+ include ::standard
include passwords::misc::scripts
class { 'role::mariadb::grants::production':
diff --git a/modules/role/manifests/mariadb/dbstore2.pp
b/modules/role/manifests/mariadb/dbstore2.pp
index c6bdbda..032eaea 100644
--- a/modules/role/manifests/mariadb/dbstore2.pp
+++ b/modules/role/manifests/mariadb/dbstore2.pp
@@ -12,7 +12,7 @@
include mariadb::packages_wmf
include mariadb::service
- include standard
+ include ::standard
include passwords::misc::scripts
class { 'role::mariadb::grants::production':
diff --git a/modules/role/manifests/memcached.pp
b/modules/role/manifests/memcached.pp
index 6ec7096..556c9a9 100644
--- a/modules/role/manifests/memcached.pp
+++ b/modules/role/manifests/memcached.pp
@@ -4,7 +4,7 @@
class role::memcached {
system::role { 'role::memcached': }
- include standard
+ include ::standard
include base::mysterious_sysctl
include base::firewall
include passwords::redis
diff --git a/modules/role/manifests/mw_rc_irc.pp
b/modules/role/manifests/mw_rc_irc.pp
index 113e636..7a6f23a 100644
--- a/modules/role/manifests/mw_rc_irc.pp
+++ b/modules/role/manifests/mw_rc_irc.pp
@@ -3,7 +3,7 @@
system::role { 'role::mw_rc_irc': description => 'MW Changes IRC Broadcast
Server' }
- include standard
+ include ::standard
include base::firewall
include passwords::udpmxircecho
$udpmxircecho_pass = $passwords::udpmxircecho::udpmxircecho_pass
diff --git a/modules/role/manifests/ntp.pp b/modules/role/manifests/ntp.pp
index ffd9a5e..a561111 100644
--- a/modules/role/manifests/ntp.pp
+++ b/modules/role/manifests/ntp.pp
@@ -2,7 +2,7 @@
#
# Ntp server role
class role::ntp {
- include standard::ntp
+ include ::standard::ntp
system::role { 'ntp': description => 'NTP server' }
$wmf_peers = $::standard::ntp::wmf_peers
diff --git a/modules/role/manifests/ocg.pp b/modules/role/manifests/ocg.pp
index 56d5ed0..8363b2f 100644
--- a/modules/role/manifests/ocg.pp
+++ b/modules/role/manifests/ocg.pp
@@ -5,7 +5,7 @@
# filtertags: labs-project-deployment-prep labs-project-ocg
class role::ocg {
include base::firewall
- include standard
+ include ::standard
# size of tmpfs filesystem
$tmpfs_size = hiera('role::ocg::tmpfs_size', '512M')
diff --git a/modules/role/manifests/osm/common.pp
b/modules/role/manifests/osm/common.pp
index d5347f8..8d6b2d8 100644
--- a/modules/role/manifests/osm/common.pp
+++ b/modules/role/manifests/osm/common.pp
@@ -1,5 +1,5 @@
class role::osm::common {
- include standard
+ include ::standard
$root_dir = '/srv/postgres'
diff --git a/modules/role/manifests/postgres/common.pp
b/modules/role/manifests/postgres/common.pp
index 52e6033..eb29693 100644
--- a/modules/role/manifests/postgres/common.pp
+++ b/modules/role/manifests/postgres/common.pp
@@ -1,5 +1,5 @@
class role::postgres::common {
- include standard
+ include ::standard
$root_dir = '/srv/postgres'
diff --git a/modules/role/manifests/puppetmaster/puppetdb.pp
b/modules/role/manifests/puppetmaster/puppetdb.pp
index bf68d4e..b343c1c 100644
--- a/modules/role/manifests/puppetmaster/puppetdb.pp
+++ b/modules/role/manifests/puppetmaster/puppetdb.pp
@@ -2,7 +2,7 @@
class role::puppetmaster::puppetdb (
$shared_buffers = '7680MB'
) {
- include standard
+ include ::standard
include ::base::firewall
include ::passwords::postgres
diff --git a/modules/role/manifests/rcstream.pp
b/modules/role/manifests/rcstream.pp
index f05220a..be9b5f1 100644
--- a/modules/role/manifests/rcstream.pp
+++ b/modules/role/manifests/rcstream.pp
@@ -6,7 +6,7 @@
#
# filtertags: labs-project-deployment-prep
class role::rcstream {
- include standard
+ include ::standard
system::role { 'role::rcstream':
description => 'MediaWiki Recent Changes stream',
diff --git a/modules/role/manifests/restbase/server.pp
b/modules/role/manifests/restbase/server.pp
index f394a54..eeac713 100644
--- a/modules/role/manifests/restbase/server.pp
+++ b/modules/role/manifests/restbase/server.pp
@@ -7,7 +7,7 @@
include ::passwords::cassandra
include base::firewall
- include standard
+ include ::standard
include ::restbase
include ::restbase::monitoring
diff --git a/modules/role/manifests/sca.pp b/modules/role/manifests/sca.pp
index 17ef84a..3e981fc 100644
--- a/modules/role/manifests/sca.pp
+++ b/modules/role/manifests/sca.pp
@@ -3,7 +3,7 @@
class role::sca {
include role::zotero
- include standard
+ include ::standard
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..c44f14c 100644
--- a/modules/role/manifests/scb.pp
+++ b/modules/role/manifests/scb.pp
@@ -14,7 +14,7 @@
include role::pdfrender
include role::trendingedits
- include standard
+ include ::standard
include base::firewall
if hiera('has_lvs', true) {
diff --git a/modules/role/manifests/snapshot/common.pp
b/modules/role/manifests/snapshot/common.pp
index e0ede90..f355e38 100644
--- a/modules/role/manifests/snapshot/common.pp
+++ b/modules/role/manifests/snapshot/common.pp
@@ -1,6 +1,6 @@
class role::snapshot::common {
include ::dataset::user
- include standard
+ include ::standard
include base::firewall
# mw packages and dependencies, dataset server nfs mount,
diff --git a/modules/role/manifests/spare/system.pp
b/modules/role/manifests/spare/system.pp
index 1741c1e..847cc4f 100644
--- a/modules/role/manifests/spare/system.pp
+++ b/modules/role/manifests/spare/system.pp
@@ -8,7 +8,7 @@
#
# filtertags: labs-project-puppet
class role::spare::system {
- include standard
+ include ::standard
include ::base::firewall
system::role { 'role::spare::system': description => 'Unused spare system'
}
diff --git a/modules/role/manifests/statistics/cruncher.pp
b/modules/role/manifests/statistics/cruncher.pp
index 0688451..ef758f7 100644
--- a/modules/role/manifests/statistics/cruncher.pp
+++ b/modules/role/manifests/statistics/cruncher.pp
@@ -4,7 +4,7 @@
description => 'Statistics general compute node (non private data)'
}
- include standard
+ include ::standard
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..b9c7472 100644
--- a/modules/role/manifests/swift/proxy.pp
+++ b/modules/role/manifests/swift/proxy.pp
@@ -4,7 +4,7 @@
description => 'swift frontend proxy',
}
- include standard
+ include ::standard
include base::firewall
include ::swift::params
include ::swift
diff --git a/modules/role/manifests/swift/stats_reporter.pp
b/modules/role/manifests/swift/stats_reporter.pp
index 01cdae6..f244d4b 100644
--- a/modules/role/manifests/swift/stats_reporter.pp
+++ b/modules/role/manifests/swift/stats_reporter.pp
@@ -4,7 +4,7 @@
description => 'swift statistics reporter',
}
- include standard
+ include ::standard
include ::swift::params
include ::swift::stats::dispersion
include ::swift::stats::accounts
diff --git a/modules/role/manifests/swift/storage.pp
b/modules/role/manifests/swift/storage.pp
index 449b3fd..60a5c60 100644
--- a/modules/role/manifests/swift/storage.pp
+++ b/modules/role/manifests/swift/storage.pp
@@ -4,7 +4,7 @@
description => 'swift storage brick',
}
- include standard
+ include ::standard
include base::firewall
include ::swift::params
include ::swift
diff --git a/modules/role/manifests/tendril.pp
b/modules/role/manifests/tendril.pp
index 8344fe1..bfe070d 100644
--- a/modules/role/manifests/tendril.pp
+++ b/modules/role/manifests/tendril.pp
@@ -3,7 +3,7 @@
class role::tendril {
include base::firewall
- include standard
+ include ::standard
system::role { 'role::tendril': description => 'tendril server' }
diff --git a/modules/role/manifests/url_downloader.pp
b/modules/role/manifests/url_downloader.pp
index 6d700b1..e5b9dba 100644
--- a/modules/role/manifests/url_downloader.pp
+++ b/modules/role/manifests/url_downloader.pp
@@ -28,7 +28,7 @@
description => 'Upload-by-URL proxy'
}
include network::constants
- include standard
+ include ::standard
include base::firewall
$url_downloader_ip = hiera('url_downloader_ip', $::ipaddress)
diff --git a/modules/role/manifests/wdqs.pp b/modules/role/manifests/wdqs.pp
index c328e8f..e84b4f7 100644
--- a/modules/role/manifests/wdqs.pp
+++ b/modules/role/manifests/wdqs.pp
@@ -4,7 +4,7 @@
#
# filtertags: labs-project-wikidata-query
class role::wdqs {
- include standard
+ include ::standard
include base::firewall
$nagios_contact_group = 'admins,wdqs-admins'
diff --git a/modules/standard/manifests/init.pp
b/modules/standard/manifests/init.pp
index 9af6669..f05a98e 100644
--- a/modules/standard/manifests/init.pp
+++ b/modules/standard/manifests/init.pp
@@ -11,13 +11,13 @@
if hiera('use_timesyncd', false) {
unless $::fqdn in $::standard::ntp::wmf_peers[$::site] {
- include standard::ntp::timesyncd
+ include ::standard::ntp::timesyncd
}
}
else
{
unless $::fqdn in $::standard::ntp::wmf_peers[$::site] {
- include standard::ntp::client
+ include ::standard::ntp::client
}
}
diff --git a/modules/wmflib/lib/puppet/parser/functions/role.rb
b/modules/wmflib/lib/puppet/parser/functions/role.rb
index 5a88010..e03cd8a 100644
--- a/modules/wmflib/lib/puppet/parser/functions/role.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/role.rb
@@ -22,7 +22,7 @@
#
# node /^www\d+/ {
# role mediawiki::appserver # this will load the
role::mediawiki::appserver class
-# include standard #this class will use hiera lookups defined for the
role.
+# include ::standard #this class will use hiera lookups defined for the
role.
# }
#
# node monitoring.local {
--
To view, visit https://gerrit.wikimedia.org/r/337202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If0a848c683b7b149d86a2afbc67694d7d989b376
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
