Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354172 )
Change subject: fix all the "role-role" in system::roles
......................................................................
fix all the "role-role" in system::roles
system::role uses "motd::script { "role-${title}":",
which means the word "role" already gets added and we
always end up with "role-role-foo" motd scripts.
This is supposed to fix that and remove all the duplicate "role-role".
All it should influence is the motd's.
Done semi-automatically with find | grep | sed.
Change-Id: I43a208fdc616e4d3e2ad0c1905252f7f19019b40
---
M modules/profile/manifests/cassandra.pp
M modules/role/manifests/analytics_cluster/hadoop/worker.pp
M modules/role/manifests/apertium.pp
M modules/role/manifests/aqs.pp
M modules/role/manifests/archiva.pp
M modules/role/manifests/backup.pp
M modules/role/manifests/builder.pp
M modules/role/manifests/cassandra.pp
M modules/role/manifests/changeprop.pp
M modules/role/manifests/ci/master.pp
M modules/role/manifests/ci/slave.pp
M modules/role/manifests/ci/slave/android.pp
M modules/role/manifests/ci/slave/browsertests.pp
M modules/role/manifests/ci/slave/labs.pp
M modules/role/manifests/ci/slave/saucelabs.pp
M modules/role/manifests/ci/website.pp
M modules/role/manifests/citoid.pp
M modules/role/manifests/cxserver.pp
M modules/role/manifests/dataset/primary.pp
M modules/role/manifests/dataset/secondary.pp
M modules/role/manifests/debdeploy/master.pp
M modules/role/manifests/debug_proxy.pp
M modules/role/manifests/dnsrecursor.pp
M modules/role/manifests/elasticsearch/beta.pp
M modules/role/manifests/elasticsearch/cirrus.pp
M modules/role/manifests/elasticsearch/relforge.pp
M modules/role/manifests/etcd.pp
M modules/role/manifests/eventlogging/analytics/server.pp
M modules/role/manifests/eventstreams.pp
M modules/role/manifests/failoid.pp
M modules/role/manifests/ganeti.pp
M modules/role/manifests/graphite/base.pp
M modules/role/manifests/graphoid.pp
M modules/role/manifests/html5depurate/server.pp
M modules/role/manifests/installserver/dhcp.pp
M modules/role/manifests/installserver/http.pp
M modules/role/manifests/installserver/tftp.pp
M modules/role/manifests/ipmi/mgmt.pp
M modules/role/manifests/jobqueue_redis/master.pp
M modules/role/manifests/jobqueue_redis/slave.pp
M modules/role/manifests/kafka/analytics/broker.pp
M modules/role/manifests/kafka/main/broker.pp
M modules/role/manifests/labs/bastion.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/dns.pp
M modules/role/manifests/labs/dnsrecursor.pp
M modules/role/manifests/labs/nfs/misc.pp
M modules/role/manifests/labs/nfs/secondary.pp
M modules/role/manifests/labs/nfs/secondary_backup/base.pp
M modules/role/manifests/labs/openstack/nodepool.pp
M modules/role/manifests/lists.pp
M modules/role/manifests/logging/mediawiki/errors.pp
M modules/role/manifests/logging/mediawiki/udp2log.pp
M modules/role/manifests/lvs/balancer.pp
M modules/role/manifests/mail/mx.pp
M modules/role/manifests/maps/master.pp
M modules/role/manifests/maps/server.pp
M modules/role/manifests/maps/slave.pp
M modules/role/manifests/mariadb.pp
M modules/role/manifests/mariadb/beta.pp
M modules/role/manifests/mariadb/core.pp
M modules/role/manifests/mariadb/dbstore.pp
M modules/role/manifests/mariadb/dbstore2.pp
M modules/role/manifests/mariadb/labs_deprecated.pp
M modules/role/manifests/mariadb/misc.pp
M modules/role/manifests/mariadb/misc/eventlogging.pp
M modules/role/manifests/mariadb/misc/phabricator.pp
M modules/role/manifests/mariadb/parsercache.pp
M modules/role/manifests/mariadb/proxy.pp
M modules/role/manifests/mariadb/sanitarium.pp
M modules/role/manifests/mariadb/sanitarium2.pp
M modules/role/manifests/mariadb/tendril.pp
M modules/role/manifests/mariadb/wikitech.pp
M modules/role/manifests/mathoid.pp
M modules/role/manifests/mediawiki/appserver.pp
M modules/role/manifests/mediawiki/appserver/api.pp
M modules/role/manifests/mediawiki/imagescaler.pp
M modules/role/manifests/mediawiki/jobrunner.pp
M modules/role/manifests/mediawiki/memcached.pp
M modules/role/manifests/mediawiki/videoscaler.pp
M modules/role/manifests/memcached.pp
M modules/role/manifests/mgmt/drac_ilo.pp
M modules/role/manifests/mirrors.pp
M modules/role/manifests/mobileapps.pp
M modules/role/manifests/mw_rc_irc.pp
M modules/role/manifests/noc/site.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/otrs/webserver.pp
M modules/role/manifests/package/builder.pp
M modules/role/manifests/parsoid.pp
M modules/role/manifests/parsoid/testing.pp
M modules/role/manifests/pdfrender.pp
M modules/role/manifests/piwik/server.pp
M modules/role/manifests/planet_server.pp
M modules/role/manifests/pmacct.pp
M modules/role/manifests/poolcounter/server.pp
M modules/role/manifests/postgres/master.pp
M modules/role/manifests/postgres/slave.pp
M modules/role/manifests/puppet_compiler.pp
M modules/role/manifests/racktables/server.pp
M modules/role/manifests/rancid/server.pp
M modules/role/manifests/rcstream.pp
M modules/role/manifests/requesttracker/labs.pp
M modules/role/manifests/requesttracker/upgradetest.pp
M modules/role/manifests/requesttracker_server.pp
M modules/role/manifests/sentry.pp
M modules/role/manifests/snapshot/cronrunner.pp
M modules/role/manifests/snapshot/dumper.pp
M modules/role/manifests/snapshot/monitor.pp
M modules/role/manifests/snapshot/testbed.pp
M modules/role/manifests/spare/system.pp
M modules/role/manifests/statistics/cruncher.pp
M modules/role/manifests/statistics/private.pp
M modules/role/manifests/statistics/web.pp
M modules/role/manifests/statsite.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/syslog/centralserver.pp
M modules/role/manifests/systemtap/devserver.pp
M modules/role/manifests/tendril.pp
M modules/role/manifests/test/system.pp
M modules/role/manifests/toollabs/bastion.pp
M modules/role/manifests/toollabs/checker.pp
M modules/role/manifests/toollabs/compute.pp
M modules/role/manifests/toollabs/cronrunner.pp
M modules/role/manifests/toollabs/logging/centralserver.pp
M modules/role/manifests/toollabs/mailrelay.pp
M modules/role/manifests/toollabs/master.pp
M modules/role/manifests/toollabs/proxy.pp
M modules/role/manifests/toollabs/services.pp
M modules/role/manifests/toollabs/shadow.pp
M modules/role/manifests/toollabs/static.pp
M modules/role/manifests/tor_relay.pp
M modules/role/manifests/trendingedits.pp
M modules/role/manifests/wdqs.pp
M modules/role/manifests/webserver_misc_static.pp
M modules/role/manifests/xhgui/app.pp
M modules/role/manifests/yubiauth_server.pp
M modules/role/manifests/zookeeper/server.pp
M modules/role/manifests/zuul/merger.pp
M modules/role/manifests/zuul/server.pp
M modules/system/manifests/role.pp
M utils/new_wmf_service.py
151 files changed, 151 insertions(+), 151 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/354172/1
diff --git a/modules/profile/manifests/cassandra.pp
b/modules/profile/manifests/cassandra.pp
index 4554c3f..0faa27c 100644
--- a/modules/profile/manifests/cassandra.pp
+++ b/modules/profile/manifests/cassandra.pp
@@ -61,7 +61,7 @@
ensure => absent,
}
- system::role { 'role::cassandra':
+ system::role { 'cassandra':
description => 'Cassandra server',
}
diff --git a/modules/role/manifests/analytics_cluster/hadoop/worker.pp
b/modules/role/manifests/analytics_cluster/hadoop/worker.pp
index d3fb532..24e5824 100644
--- a/modules/role/manifests/analytics_cluster/hadoop/worker.pp
+++ b/modules/role/manifests/analytics_cluster/hadoop/worker.pp
@@ -3,7 +3,7 @@
#
# filtertags: labs-project-analytics labs-project-math
class role::analytics_cluster::hadoop::worker {
- system::role { 'role::analytics_cluster::hadoop::worker':
+ system::role { 'analytics_cluster::hadoop::worker':
description => 'Hadoop Worker (DataNode & NodeManager)',
}
diff --git a/modules/role/manifests/apertium.pp
b/modules/role/manifests/apertium.pp
index dae0126..613bb40 100644
--- a/modules/role/manifests/apertium.pp
+++ b/modules/role/manifests/apertium.pp
@@ -4,7 +4,7 @@
class role::apertium(
$port = '2737',
) {
- system::role { 'role::apertium':
+ system::role { 'apertium':
description => 'Apertium APY server'
}
diff --git a/modules/role/manifests/aqs.pp b/modules/role/manifests/aqs.pp
index 095646f..ccc3a7f 100644
--- a/modules/role/manifests/aqs.pp
+++ b/modules/role/manifests/aqs.pp
@@ -6,7 +6,7 @@
#
# filtertags: labs-project-deployment-prep
class role::aqs {
- system::role { 'role::aqs':
+ system::role { 'aqs':
description => 'Analytics Query Service Node',
}
diff --git a/modules/role/manifests/archiva.pp
b/modules/role/manifests/archiva.pp
index b5c9cb2..8ec1c4a 100644
--- a/modules/role/manifests/archiva.pp
+++ b/modules/role/manifests/archiva.pp
@@ -5,7 +5,7 @@
# a git-fat store.
#
class role::archiva {
- system::role { 'role::archiva': description => 'Apache Archiva Host' }
+ system::role { 'archiva': description => 'Apache Archiva Host' }
include ::base::firewall
diff --git a/modules/role/manifests/backup.pp b/modules/role/manifests/backup.pp
index b61004c..aff0ee9 100644
--- a/modules/role/manifests/backup.pp
+++ b/modules/role/manifests/backup.pp
@@ -5,7 +5,7 @@
include ::profile::backup::storage
include ::standard
- system::role { 'role::backup':
+ system::role { 'backup':
description => 'Backup server',
}
}
diff --git a/modules/role/manifests/builder.pp
b/modules/role/manifests/builder.pp
index d3055b5..8d015c5 100644
--- a/modules/role/manifests/builder.pp
+++ b/modules/role/manifests/builder.pp
@@ -8,7 +8,7 @@
include ::profile::docker::builder
include role::systemtap::devserver
- system::role { 'role::builder':
+ system::role { 'builder':
description => 'Docker images builder',
}
}
diff --git a/modules/role/manifests/cassandra.pp
b/modules/role/manifests/cassandra.pp
index be0ce07..657e673 100644
--- a/modules/role/manifests/cassandra.pp
+++ b/modules/role/manifests/cassandra.pp
@@ -36,7 +36,7 @@
ensure => absent,
}
- system::role { 'role::cassandra':
+ system::role { 'cassandra':
description => 'Cassandra server',
}
diff --git a/modules/role/manifests/changeprop.pp
b/modules/role/manifests/changeprop.pp
index 888ecf7..92e8daa 100644
--- a/modules/role/manifests/changeprop.pp
+++ b/modules/role/manifests/changeprop.pp
@@ -5,7 +5,7 @@
$kafka_config = kafka_config('main')
- system::role { 'role::changeprop':
+ system::role { 'changeprop':
description => 'propagates events from the EventBus',
}
diff --git a/modules/role/manifests/ci/master.pp
b/modules/role/manifests/ci/master.pp
index d2417c3..04476a7 100644
--- a/modules/role/manifests/ci/master.pp
+++ b/modules/role/manifests/ci/master.pp
@@ -17,7 +17,7 @@
$jenkins_prefix = '/ci'
) {
- system::role { 'role::ci::master': description => 'CI Jenkins master' }
+ system::role { 'ci::master': description => 'CI Jenkins master' }
include ::standard
diff --git a/modules/role/manifests/ci/slave.pp
b/modules/role/manifests/ci/slave.pp
index 9de9244..d1d2609 100644
--- a/modules/role/manifests/ci/slave.pp
+++ b/modules/role/manifests/ci/slave.pp
@@ -8,7 +8,7 @@
#
class role::ci::slave {
- system::role { 'role::ci::slave': description => 'CI slave runner' }
+ system::role { 'ci::slave': description => 'CI slave runner' }
include contint::packages::base
include ::zuul
diff --git a/modules/role/manifests/ci/slave/android.pp
b/modules/role/manifests/ci/slave/android.pp
index ae22ff9..55544fc 100644
--- a/modules/role/manifests/ci/slave/android.pp
+++ b/modules/role/manifests/ci/slave/android.pp
@@ -8,7 +8,7 @@
requires_realm('labs')
requires_os('debian >= jessie')
- system::role { 'role::ci::slave::android':
+ system::role { 'ci::slave::android':
description => 'CI Jenkins slave for Android testing',
}
diff --git a/modules/role/manifests/ci/slave/browsertests.pp
b/modules/role/manifests/ci/slave/browsertests.pp
index 842f47f..c28457e 100644
--- a/modules/role/manifests/ci/slave/browsertests.pp
+++ b/modules/role/manifests/ci/slave/browsertests.pp
@@ -5,7 +5,7 @@
class role::ci::slave::browsertests {
requires_realm('labs')
- system::role { 'role::ci::slave::browsertests':
+ system::role { 'ci::slave::browsertests':
description => 'CI Jenkins slave for browser tests',
}
diff --git a/modules/role/manifests/ci/slave/labs.pp
b/modules/role/manifests/ci/slave/labs.pp
index 20051e0..01089f2 100644
--- a/modules/role/manifests/ci/slave/labs.pp
+++ b/modules/role/manifests/ci/slave/labs.pp
@@ -2,7 +2,7 @@
class role::ci::slave::labs {
requires_realm('labs')
- system::role { 'role::ci::slave::labs':
+ system::role { 'ci::slave::labs':
description => 'CI Jenkins slave on labs' }
# Debian slaves are used to build Debian packages for all our distributions
diff --git a/modules/role/manifests/ci/slave/saucelabs.pp
b/modules/role/manifests/ci/slave/saucelabs.pp
index 12f0e36..a883296 100644
--- a/modules/role/manifests/ci/slave/saucelabs.pp
+++ b/modules/role/manifests/ci/slave/saucelabs.pp
@@ -9,7 +9,7 @@
# filtertags: labs-project-git labs-project-integration labs-project-ci-staging
class role::ci::slave::saucelabs {
- system::role { 'role::ci::slave::saucelabs':
+ system::role { 'ci::slave::saucelabs':
description => 'CI Jenkins slave for jobs running on SauceLabs',
}
diff --git a/modules/role/manifests/ci/website.pp
b/modules/role/manifests/ci/website.pp
index 58b7720..41402f9 100644
--- a/modules/role/manifests/ci/website.pp
+++ b/modules/role/manifests/ci/website.pp
@@ -6,7 +6,7 @@
# http://integration.wikimedia.org/
class role::ci::website {
- system::role { 'role::ci::website': description => 'CI Websites' }
+ system::role { 'ci::website': description => 'CI Websites' }
# Needed at least for the jenkins-slave user
require ::role::ci::slave
diff --git a/modules/role/manifests/citoid.pp b/modules/role/manifests/citoid.pp
index 7f0048d..8359e5a 100644
--- a/modules/role/manifests/citoid.pp
+++ b/modules/role/manifests/citoid.pp
@@ -3,7 +3,7 @@
# filtertags: labs-project-deployment-prep
class role::citoid {
- system::role { 'role::citoid': }
+ system::role { 'citoid': }
include ::citoid
}
diff --git a/modules/role/manifests/cxserver.pp
b/modules/role/manifests/cxserver.pp
index 679e1ed..6b877ce 100644
--- a/modules/role/manifests/cxserver.pp
+++ b/modules/role/manifests/cxserver.pp
@@ -3,7 +3,7 @@
# filtertags: labs-project-deployment-prep
class role::cxserver {
- system::role { 'role::cxserver':
+ system::role { 'cxserver':
description => 'content translation server'
}
diff --git a/modules/role/manifests/dataset/primary.pp
b/modules/role/manifests/dataset/primary.pp
index f700fe3..34281a1 100644
--- a/modules/role/manifests/dataset/primary.pp
+++ b/modules/role/manifests/dataset/primary.pp
@@ -6,7 +6,7 @@
class role::dataset::primary {
include role::dataset::common
- system::role { 'role::dataset::primary':
+ system::role { 'dataset::primary':
description => 'dataset primary host',
}
diff --git a/modules/role/manifests/dataset/secondary.pp
b/modules/role/manifests/dataset/secondary.pp
index 131a239..309fba0 100644
--- a/modules/role/manifests/dataset/secondary.pp
+++ b/modules/role/manifests/dataset/secondary.pp
@@ -4,7 +4,7 @@
class role::dataset::secondary {
include role::dataset::common
- system::role { 'role::dataset::secondary':
+ system::role { 'dataset::secondary':
description => 'dataset secondary host',
}
diff --git a/modules/role/manifests/debdeploy/master.pp
b/modules/role/manifests/debdeploy/master.pp
index 113038d..e8a0514 100644
--- a/modules/role/manifests/debdeploy/master.pp
+++ b/modules/role/manifests/debdeploy/master.pp
@@ -1,7 +1,7 @@
class role::debdeploy::master {
include ::standard
- system::role { 'role::debdeploymaster':
+ system::role { 'debdeploymaster':
description => 'debdeploy master',
}
diff --git a/modules/role/manifests/debug_proxy.pp
b/modules/role/manifests/debug_proxy.pp
index ba9a148..55875ee 100644
--- a/modules/role/manifests/debug_proxy.pp
+++ b/modules/role/manifests/debug_proxy.pp
@@ -5,7 +5,7 @@
# the value of the X-Wikimedia-Debug HTTP header.
#
class role::debug_proxy {
- system::role { 'role::debug_proxy':
+ system::role { 'debug_proxy':
description => 'X-Wikimedia-Debug proxy',
}
diff --git a/modules/role/manifests/dnsrecursor.pp
b/modules/role/manifests/dnsrecursor.pp
index ce743be..751bca5 100644
--- a/modules/role/manifests/dnsrecursor.pp
+++ b/modules/role/manifests/dnsrecursor.pp
@@ -1,7 +1,7 @@
# role/dns.pp
class role::dnsrecursor {
- system::role { 'role::dnsrecursor': description => 'Recursive DNS server' }
+ system::role { 'dnsrecursor': description => 'Recursive DNS server' }
include ::lvs::configuration
include ::network::constants
diff --git a/modules/role/manifests/elasticsearch/beta.pp
b/modules/role/manifests/elasticsearch/beta.pp
index b7cf2c7..cb668a1 100644
--- a/modules/role/manifests/elasticsearch/beta.pp
+++ b/modules/role/manifests/elasticsearch/beta.pp
@@ -6,7 +6,7 @@
class role::elasticsearch::beta {
include ::profile::elasticsearch
- system::role { 'role::elasticsearch::beta':
+ system::role { 'elasticsearch::beta':
ensure => 'present',
description => 'elasticsearch beta',
}
diff --git a/modules/role/manifests/elasticsearch/cirrus.pp
b/modules/role/manifests/elasticsearch/cirrus.pp
index 46c5e50..699e854 100644
--- a/modules/role/manifests/elasticsearch/cirrus.pp
+++ b/modules/role/manifests/elasticsearch/cirrus.pp
@@ -8,7 +8,7 @@
include ::role::lvs::realserver
include ::profile::elasticsearch
- system::role { 'role::elasticsearch::cirrus':
+ system::role { 'elasticsearch::cirrus':
ensure => 'present',
description => 'elasticsearch cirrus',
}
diff --git a/modules/role/manifests/elasticsearch/relforge.pp
b/modules/role/manifests/elasticsearch/relforge.pp
index 37416e0..128f099 100644
--- a/modules/role/manifests/elasticsearch/relforge.pp
+++ b/modules/role/manifests/elasticsearch/relforge.pp
@@ -8,7 +8,7 @@
include ::profile::elasticsearch
include ::elasticsearch::nagios::check
- system::role { 'role::elasticsearch::relforge':
+ system::role { 'elasticsearch::relforge':
ensure => 'present',
description => 'elasticsearch relforge',
}
diff --git a/modules/role/manifests/etcd.pp b/modules/role/manifests/etcd.pp
index e42e439..d9e11d7 100644
--- a/modules/role/manifests/etcd.pp
+++ b/modules/role/manifests/etcd.pp
@@ -2,7 +2,7 @@
#
# filtertags: labs-project-chasetest
class role::etcd {
- system::role { 'role::etcd':
+ system::role { 'etcd':
description => 'Highly-consistent distributed k/v store'
}
diff --git a/modules/role/manifests/eventlogging/analytics/server.pp
b/modules/role/manifests/eventlogging/analytics/server.pp
index e36b822..dffe570 100644
--- a/modules/role/manifests/eventlogging/analytics/server.pp
+++ b/modules/role/manifests/eventlogging/analytics/server.pp
@@ -2,7 +2,7 @@
# Common role class that all other eventlogging analytics role classes should
include.
#
class role::eventlogging::analytics::server {
- system::role { 'role::eventlogging::analytics':
+ system::role { 'eventlogging::analytics':
description => 'EventLogging analytics processes',
}
diff --git a/modules/role/manifests/eventstreams.pp
b/modules/role/manifests/eventstreams.pp
index 8413cf7..6972948 100644
--- a/modules/role/manifests/eventstreams.pp
+++ b/modules/role/manifests/eventstreams.pp
@@ -39,7 +39,7 @@
# Default: {}
#
class role::eventstreams {
- system::role { 'role::eventstreams':
+ system::role { 'eventstreams':
description => 'Exposes configured event streams from Kafka to public
internet via HTTP SSE',
}
diff --git a/modules/role/manifests/failoid.pp
b/modules/role/manifests/failoid.pp
index c489007..db24b04 100644
--- a/modules/role/manifests/failoid.pp
+++ b/modules/role/manifests/failoid.pp
@@ -2,7 +2,7 @@
# A simple service that reject any connections to a list of ports.
class role::failoid {
- system::role { 'role::failoid': description => 'Failoid service' }
+ system::role { 'failoid': description => 'Failoid service' }
include ::standard
include ::base::firewall
diff --git a/modules/role/manifests/ganeti.pp b/modules/role/manifests/ganeti.pp
index 5d956e1..ff84128 100644
--- a/modules/role/manifests/ganeti.pp
+++ b/modules/role/manifests/ganeti.pp
@@ -5,7 +5,7 @@
# Ganeti hosts have KSM enabled. So get stats about it
diamond::collector { 'KSM': }
- system::role { 'role::ganeti':
+ system::role { 'ganeti':
description => 'Ganeti Node',
}
diff --git a/modules/role/manifests/graphite/base.pp
b/modules/role/manifests/graphite/base.pp
index 0fa906a..055b76a 100644
--- a/modules/role/manifests/graphite/base.pp
+++ b/modules/role/manifests/graphite/base.pp
@@ -31,7 +31,7 @@
require role::labs::lvm::srv
}
- system::role { 'role::graphite':
+ system::role { 'graphite':
description => 'real-time metrics processor',
}
diff --git a/modules/role/manifests/graphoid.pp
b/modules/role/manifests/graphoid.pp
index 95f4ff4..7588f83 100644
--- a/modules/role/manifests/graphoid.pp
+++ b/modules/role/manifests/graphoid.pp
@@ -3,7 +3,7 @@
# filtertags: labs-project-deployment-prep labs-project-maps-team
class role::graphoid {
- system::role { 'role::graphoid':
+ system::role { 'graphoid':
description => 'node.js service converting graph definitions into PNG'
}
diff --git a/modules/role/manifests/html5depurate/server.pp
b/modules/role/manifests/html5depurate/server.pp
index ebd9f9d..40dee75 100644
--- a/modules/role/manifests/html5depurate/server.pp
+++ b/modules/role/manifests/html5depurate/server.pp
@@ -1,7 +1,7 @@
# Class for installing an Html5Depurate service
# https://www.mediawiki.org/wiki/Html5Depurate
class role::html5depurate::server {
- system::role { 'role::html5depurate::server':
+ system::role { 'html5depurate::server':
description => 'Html5Depurate server'
}
diff --git a/modules/role/manifests/installserver/dhcp.pp
b/modules/role/manifests/installserver/dhcp.pp
index 4016b92..97cfa84 100644
--- a/modules/role/manifests/installserver/dhcp.pp
+++ b/modules/role/manifests/installserver/dhcp.pp
@@ -1,7 +1,7 @@
# Installs a DHCP server and configures it for WMF
class role::installserver::dhcp {
- system::role { 'role::installserver::dhcp':
+ system::role { 'installserver::dhcp':
description => 'WMF DHCP server',
}
diff --git a/modules/role/manifests/installserver/http.pp
b/modules/role/manifests/installserver/http.pp
index 2b9eae1..1f1738a 100644
--- a/modules/role/manifests/installserver/http.pp
+++ b/modules/role/manifests/installserver/http.pp
@@ -1,7 +1,7 @@
# Installs a web server for the install server
class role::installserver::http {
- system::role { 'role::installserver::http':
+ system::role { 'installserver::http':
description => 'WMF install HTTP server',
}
diff --git a/modules/role/manifests/installserver/tftp.pp
b/modules/role/manifests/installserver/tftp.pp
index 5337d22..e76fb49 100644
--- a/modules/role/manifests/installserver/tftp.pp
+++ b/modules/role/manifests/installserver/tftp.pp
@@ -18,7 +18,7 @@
# role(installserver::tftp)
class role::installserver::tftp {
- system::role { 'role::installserver::tftp':
+ system::role { 'installserver::tftp':
description => 'WMF TFTP server',
}
diff --git a/modules/role/manifests/ipmi/mgmt.pp
b/modules/role/manifests/ipmi/mgmt.pp
index aae0559..176ab45 100644
--- a/modules/role/manifests/ipmi/mgmt.pp
+++ b/modules/role/manifests/ipmi/mgmt.pp
@@ -1,7 +1,7 @@
# IPMItool mgmt hosts
class role::ipmi::mgmt {
- system::role { 'role::ipmi::mgmt':
+ system::role { 'ipmi::mgmt':
description => 'IPMI Management'
}
diff --git a/modules/role/manifests/jobqueue_redis/master.pp
b/modules/role/manifests/jobqueue_redis/master.pp
index aa38b82..b390ce8 100644
--- a/modules/role/manifests/jobqueue_redis/master.pp
+++ b/modules/role/manifests/jobqueue_redis/master.pp
@@ -3,7 +3,7 @@
include ::base::firewall
include ::profile::redis::multidc
- system::role { 'role::jobqueue_redis::master':
+ system::role { 'jobqueue_redis::master':
description => 'Jobqueue master',
}
}
diff --git a/modules/role/manifests/jobqueue_redis/slave.pp
b/modules/role/manifests/jobqueue_redis/slave.pp
index 3cd6c6a..a3a90f1 100644
--- a/modules/role/manifests/jobqueue_redis/slave.pp
+++ b/modules/role/manifests/jobqueue_redis/slave.pp
@@ -4,7 +4,7 @@
include ::profile::redis::slave
- system::role { 'role::jobqueue_redis::slave':
+ system::role { 'jobqueue_redis::slave':
description => 'Jobqueue slave',
}
}
diff --git a/modules/role/manifests/kafka/analytics/broker.pp
b/modules/role/manifests/kafka/analytics/broker.pp
index 8f1652c..0559aa6 100644
--- a/modules/role/manifests/kafka/analytics/broker.pp
+++ b/modules/role/manifests/kafka/analytics/broker.pp
@@ -16,7 +16,7 @@
$zookeeper_url = $config['zookeeper']['url']
$brokers_string = $config['brokers']['string']
- system::role { 'role::kafka::analytics::broker':
+ system::role { 'kafka::analytics::broker':
description => "Kafka Broker Server in the ${cluster_name} cluster",
}
diff --git a/modules/role/manifests/kafka/main/broker.pp
b/modules/role/manifests/kafka/main/broker.pp
index 1649d1f..abbfd3b 100644
--- a/modules/role/manifests/kafka/main/broker.pp
+++ b/modules/role/manifests/kafka/main/broker.pp
@@ -16,7 +16,7 @@
$zookeeper_url = $config['zookeeper']['url']
$brokers_string = $config['brokers']['string']
- system::role { 'role::kafka::main::broker':
+ system::role { 'kafka::main::broker':
description => "Kafka Broker Server in the ${cluster_name} cluster",
}
diff --git a/modules/role/manifests/labs/bastion.pp
b/modules/role/manifests/labs/bastion.pp
index 088d97c..5dd5693 100644
--- a/modules/role/manifests/labs/bastion.pp
+++ b/modules/role/manifests/labs/bastion.pp
@@ -1,6 +1,6 @@
# filtertags: labs-project-bastion labs-project-mwoffliner
class role::labs::bastion {
- system::role { 'role::labs::bastion':
+ system::role { 'labs::bastion':
description => 'Labs bastion host (with mosh enabled)',
}
diff --git a/modules/role/manifests/labs/db/master.pp
b/modules/role/manifests/labs/db/master.pp
index eda2bbd..b8820dd 100644
--- a/modules/role/manifests/labs/db/master.pp
+++ b/modules/role/manifests/labs/db/master.pp
@@ -1,6 +1,6 @@
class role::labs::db::master {
- system::role { 'role::labs::db::master':
+ system::role { 'labs::db::master':
description => 'Labs user database master',
}
diff --git a/modules/role/manifests/labs/db/proxy.pp
b/modules/role/manifests/labs/db/proxy.pp
index e2c8ef7..c47aaab 100644
--- a/modules/role/manifests/labs/db/proxy.pp
+++ b/modules/role/manifests/labs/db/proxy.pp
@@ -3,7 +3,7 @@
# labs-support network
class role::labs::db::proxy {
- system::role { 'role::labs::db::proxy':
+ system::role { 'labs::db::proxy':
description => 'LabsDB proxy',
}
diff --git a/modules/role/manifests/labs/db/replica.pp
b/modules/role/manifests/labs/db/replica.pp
index 28c3145..2b11f02 100644
--- a/modules/role/manifests/labs/db/replica.pp
+++ b/modules/role/manifests/labs/db/replica.pp
@@ -1,6 +1,6 @@
class role::labs::db::replica {
- system::role { 'role::labs::db::replica':
+ system::role { 'labs::db::replica':
description => 'Labs replica database',
}
diff --git a/modules/role/manifests/labs/db/slave.pp
b/modules/role/manifests/labs/db/slave.pp
index 59a6c65..1eadb90 100644
--- a/modules/role/manifests/labs/db/slave.pp
+++ b/modules/role/manifests/labs/db/slave.pp
@@ -1,6 +1,6 @@
class role::labs::db::slave {
- system::role { 'role::labs::db::slave':
+ system::role { 'labs::db::slave':
description => 'Labs user database slave',
}
diff --git a/modules/role/manifests/labs/dns.pp
b/modules/role/manifests/labs/dns.pp
index 8a6ab09..e15edcb 100644
--- a/modules/role/manifests/labs/dns.pp
+++ b/modules/role/manifests/labs/dns.pp
@@ -1,6 +1,6 @@
class role::labs::dns {
- system::role { 'role::labs::dns':
+ system::role { 'labs::dns':
description => 'DNS server for Labs instances',
}
diff --git a/modules/role/manifests/labs/dnsrecursor.pp
b/modules/role/manifests/labs/dnsrecursor.pp
index 74763a1..b922a68 100644
--- a/modules/role/manifests/labs/dnsrecursor.pp
+++ b/modules/role/manifests/labs/dnsrecursor.pp
@@ -23,7 +23,7 @@
class role::labs::dnsrecursor {
- system::role { 'role::labs::dnsrecursor':
+ system::role { 'labs::dnsrecursor':
description => 'Recursive DNS server for Labs instances',
}
diff --git a/modules/role/manifests/labs/nfs/misc.pp
b/modules/role/manifests/labs/nfs/misc.pp
index c3bd6f1..2d807f5 100644
--- a/modules/role/manifests/labs/nfs/misc.pp
+++ b/modules/role/manifests/labs/nfs/misc.pp
@@ -5,7 +5,7 @@
class role::labs::nfs::misc($dump_servers_ips, $maps_project_internal_ips) {
- system::role { 'role::labs::nfs::misc':
+ system::role { 'labs::nfs::misc':
description => 'Labs NFS service (misc)',
}
diff --git a/modules/role/manifests/labs/nfs/secondary.pp
b/modules/role/manifests/labs/nfs/secondary.pp
index 2c102f9..bc05c13 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -1,6 +1,6 @@
class role::labs::nfs::secondary($monitor = 'eth0') {
- system::role { 'role::labs::nfs::secondary':
+ system::role { 'labs::nfs::secondary':
description => 'NFS secondary share cluster',
}
diff --git a/modules/role/manifests/labs/nfs/secondary_backup/base.pp
b/modules/role/manifests/labs/nfs/secondary_backup/base.pp
index fd2a403..94b38a7 100644
--- a/modules/role/manifests/labs/nfs/secondary_backup/base.pp
+++ b/modules/role/manifests/labs/nfs/secondary_backup/base.pp
@@ -1,6 +1,6 @@
class role::labs::nfs::secondary_backup::base {
- system::role { 'role::labs::nfs::secondary_backup':
+ system::role { 'labs::nfs::secondary_backup':
description => 'NFS shares secondary backup',
}
diff --git a/modules/role/manifests/labs/openstack/nodepool.pp
b/modules/role/manifests/labs/openstack/nodepool.pp
index b9dd941..ee2d548 100644
--- a/modules/role/manifests/labs/openstack/nodepool.pp
+++ b/modules/role/manifests/labs/openstack/nodepool.pp
@@ -6,7 +6,7 @@
#
class role::labs::openstack::nodepool {
- system::role { 'role::nodepool': description => 'CI Nodepool' }
+ system::role { 'nodepool': description => 'CI Nodepool' }
include passwords::nodepool
$nova_controller = hiera('labs_nova_controller')
diff --git a/modules/role/manifests/lists.pp b/modules/role/manifests/lists.pp
index c4d6566..e01e367 100644
--- a/modules/role/manifests/lists.pp
+++ b/modules/role/manifests/lists.pp
@@ -1,7 +1,7 @@
# sets up a mailing list server
class role::lists {
- system::role { 'role::lists': description => 'Mailing list server', }
+ system::role { 'lists': description => 'Mailing list server', }
include ::standard
include ::profile::backup::host
diff --git a/modules/role/manifests/logging/mediawiki/errors.pp
b/modules/role/manifests/logging/mediawiki/errors.pp
index ef66857..1830ca0 100644
--- a/modules/role/manifests/logging/mediawiki/errors.pp
+++ b/modules/role/manifests/logging/mediawiki/errors.pp
@@ -4,7 +4,7 @@
# role provisions a metric module that reports error counts to StatsD.
#
class role::logging::mediawiki::errors {
- system::role { 'role::logging::mediawiki::errors':
+ system::role { 'logging::mediawiki::errors':
description => 'Report MediaWiki exceptions and fatals to StatsD',
}
diff --git a/modules/role/manifests/logging/mediawiki/udp2log.pp
b/modules/role/manifests/logging/mediawiki/udp2log.pp
index 93eddcd..45a1f15 100644
--- a/modules/role/manifests/logging/mediawiki/udp2log.pp
+++ b/modules/role/manifests/logging/mediawiki/udp2log.pp
@@ -9,7 +9,7 @@
$forward_messages = false,
$mirror_destinations = undef,
) {
- system::role { 'role::logging:mediawiki::udp2log':
+ system::role { 'logging:mediawiki::udp2log':
description => 'MediaWiki log collector',
}
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index 52bc318..1f5df43 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -1,5 +1,5 @@
class role::lvs::balancer {
- system::role { 'role::lvs::balancer': description => 'LVS balancer' }
+ system::role { 'lvs::balancer': description => 'LVS balancer' }
$rp_args = inline_template('<%= @interfaces.split(",").map{|x|
"net.ipv4.conf.#{x.gsub("_","/")}.rp_filter=0" if !x.start_with?("lo")
}.compact.join(",") %>')
nrpe::monitor_service { 'check_rp_filter_disabled':
diff --git a/modules/role/manifests/mail/mx.pp
b/modules/role/manifests/mail/mx.pp
index d7394c8..093ec7b 100644
--- a/modules/role/manifests/mail/mx.pp
+++ b/modules/role/manifests/mail/mx.pp
@@ -10,7 +10,7 @@
include privateexim::aliases::private
include ::base::firewall
- system::role { 'role::mail::mx':
+ system::role { 'mail::mx':
description => 'Mail router',
}
diff --git a/modules/role/manifests/maps/master.pp
b/modules/role/manifests/maps/master.pp
index f16130e..a43aac8 100644
--- a/modules/role/manifests/maps/master.pp
+++ b/modules/role/manifests/maps/master.pp
@@ -10,7 +10,7 @@
include ::osm
include ::osm::import_waterlines
- system::role { 'role::maps::master':
+ system::role { 'maps::master':
ensure => 'present',
description => 'Maps Postgres master',
}
diff --git a/modules/role/manifests/maps/server.pp
b/modules/role/manifests/maps/server.pp
index abba308..1babd69 100644
--- a/modules/role/manifests/maps/server.pp
+++ b/modules/role/manifests/maps/server.pp
@@ -29,7 +29,7 @@
pgsql_kartotherian_pass =>
hiera('maps::postgresql_kartotherian_pass'),
}
- system::role { 'role::maps':
+ system::role { 'maps':
description => 'A vector and raster map tile generation service',
}
diff --git a/modules/role/manifests/maps/slave.pp
b/modules/role/manifests/maps/slave.pp
index ad4abaf..9a01bf4 100644
--- a/modules/role/manifests/maps/slave.pp
+++ b/modules/role/manifests/maps/slave.pp
@@ -3,7 +3,7 @@
include ::postgresql::slave
include ::role::maps::postgresql_common
- system::role { 'role::maps::slave':
+ system::role { 'maps::slave':
ensure => 'present',
description => 'Maps Postgres slave',
}
diff --git a/modules/role/manifests/mariadb.pp
b/modules/role/manifests/mariadb.pp
index 7e3870c..3539039 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -4,7 +4,7 @@
# lint:ignore:autoloader_layout
class role::mariadb {
- system::role { 'role::mariadb':
+ system::role { 'mariadb':
description => 'database server',
}
diff --git a/modules/role/manifests/mariadb/beta.pp
b/modules/role/manifests/mariadb/beta.pp
index dd3ceb4..3e8db90 100644
--- a/modules/role/manifests/mariadb/beta.pp
+++ b/modules/role/manifests/mariadb/beta.pp
@@ -4,7 +4,7 @@
# filtertags: labs-project-deployment-prep
class role::mariadb::beta {
- system::role { 'role::mariadb::beta':
+ system::role { 'mariadb::beta':
description => 'beta cluster database server',
}
diff --git a/modules/role/manifests/mariadb/core.pp
b/modules/role/manifests/mariadb/core.pp
index 545ba88..69de8d1 100644
--- a/modules/role/manifests/mariadb/core.pp
+++ b/modules/role/manifests/mariadb/core.pp
@@ -5,7 +5,7 @@
$master = false,
) {
- system::role { 'role::mariadb::core':
+ system::role { 'mariadb::core':
description => "Core DB Server ${shard}",
}
diff --git a/modules/role/manifests/mariadb/dbstore.pp
b/modules/role/manifests/mariadb/dbstore.pp
index 75c34e9..bc7c641 100644
--- a/modules/role/manifests/mariadb/dbstore.pp
+++ b/modules/role/manifests/mariadb/dbstore.pp
@@ -5,7 +5,7 @@
$warn_stopped = true,
) {
- system::role { 'role::mariadb::dbstore':
+ system::role { 'mariadb::dbstore':
description => 'Delayed Slave',
}
diff --git a/modules/role/manifests/mariadb/dbstore2.pp
b/modules/role/manifests/mariadb/dbstore2.pp
index c02e768..89ec562 100644
--- a/modules/role/manifests/mariadb/dbstore2.pp
+++ b/modules/role/manifests/mariadb/dbstore2.pp
@@ -5,7 +5,7 @@
$warn_stopped = true,
) {
- system::role { 'role::mariadb::dbstore2':
+ system::role { 'mariadb::dbstore2':
description => 'Delayed Slave',
}
diff --git a/modules/role/manifests/mariadb/labs_deprecated.pp
b/modules/role/manifests/mariadb/labs_deprecated.pp
index b4dbfc4..7c941ed 100644
--- a/modules/role/manifests/mariadb/labs_deprecated.pp
+++ b/modules/role/manifests/mariadb/labs_deprecated.pp
@@ -3,7 +3,7 @@
# Use role::labs::db::replica instead
class role::mariadb::labs_deprecated {
- system::role { 'role::mariadb::labs_deprecated':
+ system::role { 'mariadb::labs_deprecated':
description => 'Labs DB Slave (deprecated role)',
}
diff --git a/modules/role/manifests/mariadb/misc.pp
b/modules/role/manifests/mariadb/misc.pp
index 299c7bc..07055f8 100644
--- a/modules/role/manifests/mariadb/misc.pp
+++ b/modules/role/manifests/mariadb/misc.pp
@@ -4,7 +4,7 @@
$master = false,
) {
- system::role { 'role::mariadb::misc':
+ system::role { 'mariadb::misc':
description => "Misc Services Database ${shard}",
}
diff --git a/modules/role/manifests/mariadb/misc/eventlogging.pp
b/modules/role/manifests/mariadb/misc/eventlogging.pp
index b26ae78..633491e 100644
--- a/modules/role/manifests/mariadb/misc/eventlogging.pp
+++ b/modules/role/manifests/mariadb/misc/eventlogging.pp
@@ -6,7 +6,7 @@
$master = false,
) {
- system::role { 'role::mariadb::misc':
+ system::role { 'mariadb::misc':
description => 'Eventlogging Database',
}
diff --git a/modules/role/manifests/mariadb/misc/phabricator.pp
b/modules/role/manifests/mariadb/misc/phabricator.pp
index c8d8fb4..bb59a7e 100644
--- a/modules/role/manifests/mariadb/misc/phabricator.pp
+++ b/modules/role/manifests/mariadb/misc/phabricator.pp
@@ -10,7 +10,7 @@
$mariadb10 = true,
) {
- system::role { 'role::mariadb::misc':
+ system::role { 'mariadb::misc':
description => "Misc Services Database ${shard} (phabricator)",
}
diff --git a/modules/role/manifests/mariadb/parsercache.pp
b/modules/role/manifests/mariadb/parsercache.pp
index 359a5e6..968b821 100644
--- a/modules/role/manifests/mariadb/parsercache.pp
+++ b/modules/role/manifests/mariadb/parsercache.pp
@@ -16,7 +16,7 @@
mysql_role => 'master',
}
- system::role { 'role::mariadb::parsercache':
+ system::role { 'mariadb::parsercache':
description => "Parser Cache Database ${shard}",
}
diff --git a/modules/role/manifests/mariadb/proxy.pp
b/modules/role/manifests/mariadb/proxy.pp
index 7acdd4a..b23a7b8 100644
--- a/modules/role/manifests/mariadb/proxy.pp
+++ b/modules/role/manifests/mariadb/proxy.pp
@@ -3,7 +3,7 @@
$shard
) {
- system::role { 'role::mariadb::proxy':
+ system::role { 'mariadb::proxy':
description => "DB Proxy ${shard}",
}
diff --git a/modules/role/manifests/mariadb/sanitarium.pp
b/modules/role/manifests/mariadb/sanitarium.pp
index 4c58745..2ce86e0 100644
--- a/modules/role/manifests/mariadb/sanitarium.pp
+++ b/modules/role/manifests/mariadb/sanitarium.pp
@@ -4,7 +4,7 @@
class role::mariadb::sanitarium {
- system::role { 'role::mariadb::sanitarium':
+ system::role { 'mariadb::sanitarium':
description => 'Sanitarium DB Server',
}
diff --git a/modules/role/manifests/mariadb/sanitarium2.pp
b/modules/role/manifests/mariadb/sanitarium2.pp
index 79ed892..bf079a9 100644
--- a/modules/role/manifests/mariadb/sanitarium2.pp
+++ b/modules/role/manifests/mariadb/sanitarium2.pp
@@ -8,7 +8,7 @@
# renamed, but for now, both have to coexist.
class role::mariadb::sanitarium2 {
- system::role { 'role::mariadb::sanitarium':
+ system::role { 'mariadb::sanitarium':
description => 'Sanitarium DB Server',
}
diff --git a/modules/role/manifests/mariadb/tendril.pp
b/modules/role/manifests/mariadb/tendril.pp
index dcbac60..fd2260d 100644
--- a/modules/role/manifests/mariadb/tendril.pp
+++ b/modules/role/manifests/mariadb/tendril.pp
@@ -1,7 +1,7 @@
# tendril.wikimedia.org db
class role::mariadb::tendril {
- system::role { 'role::mariadb::tendril':
+ system::role { 'mariadb::tendril':
description => 'tendril database server',
}
diff --git a/modules/role/manifests/mariadb/wikitech.pp
b/modules/role/manifests/mariadb/wikitech.pp
index 2c7c6b3..a75fad9 100644
--- a/modules/role/manifests/mariadb/wikitech.pp
+++ b/modules/role/manifests/mariadb/wikitech.pp
@@ -1,7 +1,7 @@
# wikitech instance (silver)
class role::mariadb::wikitech {
- system::role { 'role::mariadb::wikitech':
+ system::role { 'mariadb::wikitech':
description => 'Wikitech Database',
}
diff --git a/modules/role/manifests/mathoid.pp
b/modules/role/manifests/mathoid.pp
index ee6239a..b10f5c4 100644
--- a/modules/role/manifests/mathoid.pp
+++ b/modules/role/manifests/mathoid.pp
@@ -2,7 +2,7 @@
#
# filtertags: labs-project-deployment-prep
class role::mathoid{
- system::role { 'role::mathoid':
+ system::role { 'mathoid':
description => 'mathoid server'
}
diff --git a/modules/role/manifests/mediawiki/appserver.pp
b/modules/role/manifests/mediawiki/appserver.pp
index 2c5c73b..d113a58 100644
--- a/modules/role/manifests/mediawiki/appserver.pp
+++ b/modules/role/manifests/mediawiki/appserver.pp
@@ -1,6 +1,6 @@
# filtertags: labs-project-deployment-prep
class role::mediawiki::appserver {
- system::role { 'role::mediawiki::appserver': }
+ system::role { 'mediawiki::appserver': }
include ::role::mediawiki::webserver
include ::role::prometheus::apache_exporter
diff --git a/modules/role/manifests/mediawiki/appserver/api.pp
b/modules/role/manifests/mediawiki/appserver/api.pp
index 645aae7..763180a 100644
--- a/modules/role/manifests/mediawiki/appserver/api.pp
+++ b/modules/role/manifests/mediawiki/appserver/api.pp
@@ -1,5 +1,5 @@
class role::mediawiki::appserver::api {
- system::role { 'role::mediawiki::appserver::api': }
+ system::role { 'mediawiki::appserver::api': }
include ::role::mediawiki::webserver
include ::role::prometheus::apache_exporter
diff --git a/modules/role/manifests/mediawiki/imagescaler.pp
b/modules/role/manifests/mediawiki/imagescaler.pp
index db12d57..b2de4d3 100644
--- a/modules/role/manifests/mediawiki/imagescaler.pp
+++ b/modules/role/manifests/mediawiki/imagescaler.pp
@@ -1,5 +1,5 @@
class role::mediawiki::imagescaler {
- system::role { 'role::mediawiki::imagescaler': }
+ system::role { 'mediawiki::imagescaler': }
include ::role::mediawiki::scaler
include ::role::mediawiki::webserver
diff --git a/modules/role/manifests/mediawiki/jobrunner.pp
b/modules/role/manifests/mediawiki/jobrunner.pp
index 12cf0be..2e39b7e 100644
--- a/modules/role/manifests/mediawiki/jobrunner.pp
+++ b/modules/role/manifests/mediawiki/jobrunner.pp
@@ -1,6 +1,6 @@
# filtertags: labs-project-deployment-prep
class role::mediawiki::jobrunner {
- system::role { 'role::mediawiki::jobrunner': }
+ system::role { 'mediawiki::jobrunner': }
# Parent role (we don't use inheritance by choice)
include ::role::mediawiki::common
diff --git a/modules/role/manifests/mediawiki/memcached.pp
b/modules/role/manifests/mediawiki/memcached.pp
index e3ba076..06df46c 100644
--- a/modules/role/manifests/mediawiki/memcached.pp
+++ b/modules/role/manifests/mediawiki/memcached.pp
@@ -2,7 +2,7 @@
class role::mediawiki::memcached inherits role::memcached {
include ::profile::redis::multidc
- system::role { 'role::mediawiki::memcached':
+ system::role { 'mediawiki::memcached':
description => 'memcached+redis sessions',
}
}
diff --git a/modules/role/manifests/mediawiki/videoscaler.pp
b/modules/role/manifests/mediawiki/videoscaler.pp
index 98c4b88..9dcc824 100644
--- a/modules/role/manifests/mediawiki/videoscaler.pp
+++ b/modules/role/manifests/mediawiki/videoscaler.pp
@@ -1,6 +1,6 @@
# filtertags: labs-project-deployment-prep
class role::mediawiki::videoscaler {
- system::role { 'role::mediawiki::videoscaler': }
+ system::role { 'mediawiki::videoscaler': }
# Parent role
include ::role::mediawiki::scaler
diff --git a/modules/role/manifests/memcached.pp
b/modules/role/manifests/memcached.pp
index 29c9436..07c19eb 100644
--- a/modules/role/manifests/memcached.pp
+++ b/modules/role/manifests/memcached.pp
@@ -2,7 +2,7 @@
#
# filtertags: labs-project-deployment-prep
class role::memcached {
- system::role { 'role::memcached': }
+ system::role { 'memcached': }
include ::standard
include ::base::mysterious_sysctl
diff --git a/modules/role/manifests/mgmt/drac_ilo.pp
b/modules/role/manifests/mgmt/drac_ilo.pp
index 1610788..7affd35 100644
--- a/modules/role/manifests/mgmt/drac_ilo.pp
+++ b/modules/role/manifests/mgmt/drac_ilo.pp
@@ -2,7 +2,7 @@
# like setting passwords on DRACs/iLOs
class role::mgmt::drac_ilo {
- system::role { 'role::mgmt::drac_ilo':
+ system::role { 'mgmt::drac_ilo':
description => 'Manage management interfaces'
}
diff --git a/modules/role/manifests/mirrors.pp
b/modules/role/manifests/mirrors.pp
index 641d10a..5b3e3e6 100644
--- a/modules/role/manifests/mirrors.pp
+++ b/modules/role/manifests/mirrors.pp
@@ -3,7 +3,7 @@
# A role class used to setup our mirrors server.
class role::mirrors {
- system::role { 'role::mirrors':
+ system::role { 'mirrors':
description => 'Mirrors server',
}
diff --git a/modules/role/manifests/mobileapps.pp
b/modules/role/manifests/mobileapps.pp
index 7044b7a..d1de20f 100644
--- a/modules/role/manifests/mobileapps.pp
+++ b/modules/role/manifests/mobileapps.pp
@@ -1,7 +1,7 @@
# Role class for mobileapps
class role::mobileapps {
- system::role { 'role::mobileapps':
+ system::role { 'mobileapps':
description => 'A service for use by mobile apps. Provides DOM
manipulation, aggregation, JSON flattening'
}
diff --git a/modules/role/manifests/mw_rc_irc.pp
b/modules/role/manifests/mw_rc_irc.pp
index 947b504..d8b28d0 100644
--- a/modules/role/manifests/mw_rc_irc.pp
+++ b/modules/role/manifests/mw_rc_irc.pp
@@ -1,7 +1,7 @@
# filtertags: labs-project-deployment-prep labs-project-ircd
class role::mw_rc_irc {
- system::role { 'role::mw_rc_irc': description => 'MW Changes IRC Broadcast
Server' }
+ system::role { 'mw_rc_irc': description => 'MW Changes IRC Broadcast
Server' }
include ::standard
include ::base::firewall
diff --git a/modules/role/manifests/noc/site.pp
b/modules/role/manifests/noc/site.pp
index 140ec44..02f6e6c 100644
--- a/modules/role/manifests/noc/site.pp
+++ b/modules/role/manifests/noc/site.pp
@@ -1,7 +1,7 @@
# https://noc.wikimedia.org/
class role::noc::site {
- system::role { 'role::noc::site': description => 'noc.wikimedia.org' }
+ system::role { 'noc::site': description => 'noc.wikimedia.org' }
ferm::service { 'noc-http':
proto => 'tcp',
diff --git a/modules/role/manifests/openldap/corp.pp
b/modules/role/manifests/openldap/corp.pp
index d7ba623..2eab28d 100644
--- a/modules/role/manifests/openldap/corp.pp
+++ b/modules/role/manifests/openldap/corp.pp
@@ -6,7 +6,7 @@
include ::profile::backup::host
include ::base::firewall
- system::role { 'role::openldap::corp':
+ system::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 5aab59d..4617665 100644
--- a/modules/role/manifests/openldap/labs.pp
+++ b/modules/role/manifests/openldap/labs.pp
@@ -8,7 +8,7 @@
$ldapconfig = hiera_hash('labsldapconfig', {})
$ldap_labs_hostname = $ldapconfig['hostname']
- system::role { 'role::openldap::labs':
+ system::role { 'openldap::labs':
description => 'LDAP servers for labs (based on OpenLDAP)'
}
diff --git a/modules/role/manifests/openldap/labtest.pp
b/modules/role/manifests/openldap/labtest.pp
index 43b3a3e..172f44e 100644
--- a/modules/role/manifests/openldap/labtest.pp
+++ b/modules/role/manifests/openldap/labtest.pp
@@ -8,7 +8,7 @@
$ldapconfig = hiera_hash('labsldapconfig', {})
$ldap_labs_hostname = $ldapconfig['hostname']
- system::role { 'role::openldap::labtest':
+ system::role { 'openldap::labtest':
description => 'LDAP servers for labs test cluster (based on OpenLDAP)'
}
diff --git a/modules/role/manifests/osm/master.pp
b/modules/role/manifests/osm/master.pp
index 9eba61f..58fa6dd 100644
--- a/modules/role/manifests/osm/master.pp
+++ b/modules/role/manifests/osm/master.pp
@@ -41,7 +41,7 @@
prometheus_path => '/var/lib/prometheus/node.d/osm_sync_lag.prom',
}
- system::role { 'role::osm::master':
+ system::role { 'osm::master':
ensure => 'present',
description => 'openstreetmaps db master',
}
diff --git a/modules/role/manifests/osm/slave.pp
b/modules/role/manifests/osm/slave.pp
index 1301061..b1f9d17 100644
--- a/modules/role/manifests/osm/slave.pp
+++ b/modules/role/manifests/osm/slave.pp
@@ -9,7 +9,7 @@
# have the same dbs as the master.
#postgresql::spatialdb { 'gis': }
- system::role { 'role::osm::slave':
+ system::role { 'osm::slave':
ensure => 'present',
description => 'openstreetmaps db slave',
}
diff --git a/modules/role/manifests/otrs/webserver.pp
b/modules/role/manifests/otrs/webserver.pp
index 1909f8c..e164df1 100644
--- a/modules/role/manifests/otrs/webserver.pp
+++ b/modules/role/manifests/otrs/webserver.pp
@@ -5,7 +5,7 @@
# filtertags: labs-project-otrs
class role::otrs::webserver {
- system::role { 'role::otrs::webserver':
+ system::role { 'otrs::webserver':
description => 'OTRS Web Application Server',
}
include ::standard
diff --git a/modules/role/manifests/package/builder.pp
b/modules/role/manifests/package/builder.pp
index be7a392..b528d0b 100644
--- a/modules/role/manifests/package/builder.pp
+++ b/modules/role/manifests/package/builder.pp
@@ -7,7 +7,7 @@
include ::package_builder
include ::base::firewall
- system::role { 'role::package::builder':
+ system::role { 'package::builder':
description => 'Debian package builder'
}
diff --git a/modules/role/manifests/parsoid.pp
b/modules/role/manifests/parsoid.pp
index 63af98b..db58d4a 100644
--- a/modules/role/manifests/parsoid.pp
+++ b/modules/role/manifests/parsoid.pp
@@ -3,7 +3,7 @@
# filtertags: labs-project-deployment-prep
class role::parsoid {
- system::role { 'role::parsoid':
+ system::role { 'parsoid':
description => "Parsoid ${::realm}"
}
diff --git a/modules/role/manifests/parsoid/testing.pp
b/modules/role/manifests/parsoid/testing.pp
index c4fa9b4..ec686c4 100644
--- a/modules/role/manifests/parsoid/testing.pp
+++ b/modules/role/manifests/parsoid/testing.pp
@@ -1,7 +1,7 @@
# This role is used by testing services
# Ex: Parsoid roundtrip testing, Parsoid & PHP parser visual diff testing
class role::parsoid::testing {
- system::role { 'role::parsoid::testing':
+ system::role { 'parsoid::testing':
description => 'Parsoid server (rt-testing, visual-diffing, etc.)'
}
diff --git a/modules/role/manifests/pdfrender.pp
b/modules/role/manifests/pdfrender.pp
index e12bc64..21cf388 100644
--- a/modules/role/manifests/pdfrender.pp
+++ b/modules/role/manifests/pdfrender.pp
@@ -1,7 +1,7 @@
class role::pdfrender {
$is_active = hiera('role::pdfrender::is_active', true)
- system::role { 'role::pdfrender':
+ system::role { 'pdfrender':
description => 'A PDF render service based on Electron',
}
diff --git a/modules/role/manifests/piwik/server.pp
b/modules/role/manifests/piwik/server.pp
index ff62318..2d4bbfe 100644
--- a/modules/role/manifests/piwik/server.pp
+++ b/modules/role/manifests/piwik/server.pp
@@ -9,7 +9,7 @@
# Ref: T159136
require_package('mysql-server')
- system::role { 'role::piwik::server':
+ system::role { 'piwik::server':
description => 'Analytics piwik server',
}
}
diff --git a/modules/role/manifests/planet_server.pp
b/modules/role/manifests/planet_server.pp
index 785f697..1feb8fa 100644
--- a/modules/role/manifests/planet_server.pp
+++ b/modules/role/manifests/planet_server.pp
@@ -4,7 +4,7 @@
include ::standard
include ::profile::planet::venus
- system::role { 'role::planet_server':
+ system::role { 'planet_server':
description => 'Planet (venus) weblog aggregator'
}
}
diff --git a/modules/role/manifests/pmacct.pp b/modules/role/manifests/pmacct.pp
index 8326cc6..fd3a909 100644
--- a/modules/role/manifests/pmacct.pp
+++ b/modules/role/manifests/pmacct.pp
@@ -1,5 +1,5 @@
class role::pmacct {
- system::role { 'role::pmacct':
+ system::role { 'pmacct':
description => 'pmacct netflow accounting',
}
diff --git a/modules/role/manifests/poolcounter/server.pp
b/modules/role/manifests/poolcounter/server.pp
index 0195d29..dcea95f 100644
--- a/modules/role/manifests/poolcounter/server.pp
+++ b/modules/role/manifests/poolcounter/server.pp
@@ -4,7 +4,7 @@
include ::poolcounter
include ::base::firewall
- system::role { 'role::poolcounter':
+ system::role { 'poolcounter':
description => 'PoolCounter server',
}
diff --git a/modules/role/manifests/postgres/master.pp
b/modules/role/manifests/postgres/master.pp
index 1a5b0bb..fe06b89 100644
--- a/modules/role/manifests/postgres/master.pp
+++ b/modules/role/manifests/postgres/master.pp
@@ -14,7 +14,7 @@
pgstats_pass => $passwords::postgres::ganglia_pass,
}
- system::role { 'role::postgres::master':
+ system::role { 'postgres::master':
ensure => 'present',
description => 'Postgres db master',
}
diff --git a/modules/role/manifests/postgres/slave.pp
b/modules/role/manifests/postgres/slave.pp
index ab26f2c..43cd954 100644
--- a/modules/role/manifests/postgres/slave.pp
+++ b/modules/role/manifests/postgres/slave.pp
@@ -3,7 +3,7 @@
include ::postgresql::postgis
include ::passwords::postgres
- system::role { 'role::postgres::slave':
+ system::role { 'postgres::slave':
ensure => 'present',
description => 'Postgres db slave',
}
diff --git a/modules/role/manifests/puppet_compiler.pp
b/modules/role/manifests/puppet_compiler.pp
index ad9aae8..5c413c1 100644
--- a/modules/role/manifests/puppet_compiler.pp
+++ b/modules/role/manifests/puppet_compiler.pp
@@ -1,7 +1,7 @@
# filtertags: labs-project-toolsbeta labs-project-puppet3-diffs
class role::puppet_compiler {
- system::role { 'role::puppet_compiler': description => 'Puppet compiler
jenkins slave'}
+ system::role { 'puppet_compiler': description => 'Puppet compiler jenkins
slave'}
case $::realm {
'labs' : {
diff --git a/modules/role/manifests/racktables/server.pp
b/modules/role/manifests/racktables/server.pp
index 3378796..5302a68 100644
--- a/modules/role/manifests/racktables/server.pp
+++ b/modules/role/manifests/racktables/server.pp
@@ -8,7 +8,7 @@
# filtertags: labs-project-servermon
class role::racktables::server {
- system::role { 'role::racktables::server': description => 'Racktables
server' }
+ system::role { 'racktables::server': description => 'Racktables server' }
include ::standard
include ::base::firewall
diff --git a/modules/role/manifests/rancid/server.pp
b/modules/role/manifests/rancid/server.pp
index 3f03912..24c8e7e 100644
--- a/modules/role/manifests/rancid/server.pp
+++ b/modules/role/manifests/rancid/server.pp
@@ -1,7 +1,7 @@
# Really Awful Notorious CIsco config Differ
class role::rancid::server {
- system::role { 'role::rancid::server':
+ system::role { 'rancid::server':
description => 'Really Awful Notorious CIsco config Differ (sp)'
}
diff --git a/modules/role/manifests/rcstream.pp
b/modules/role/manifests/rcstream.pp
index be9b5f1..663e7e1 100644
--- a/modules/role/manifests/rcstream.pp
+++ b/modules/role/manifests/rcstream.pp
@@ -8,7 +8,7 @@
class role::rcstream {
include ::standard
- system::role { 'role::rcstream':
+ system::role { 'rcstream':
description => 'MediaWiki Recent Changes stream',
}
diff --git a/modules/role/manifests/requesttracker/labs.pp
b/modules/role/manifests/requesttracker/labs.pp
index d998e6c..5071924 100644
--- a/modules/role/manifests/requesttracker/labs.pp
+++ b/modules/role/manifests/requesttracker/labs.pp
@@ -1,6 +1,6 @@
# Labs/testing RT
class role::requesttracker::labs {
- system::role { 'role::requesttracker::labs': description => 'RT (Labs)' }
+ system::role { 'requesttracker::labs': description => 'RT (Labs)' }
include passwords::misc::rt
diff --git a/modules/role/manifests/requesttracker/upgradetest.pp
b/modules/role/manifests/requesttracker/upgradetest.pp
index 8dd345a..e5d453e 100644
--- a/modules/role/manifests/requesttracker/upgradetest.pp
+++ b/modules/role/manifests/requesttracker/upgradetest.pp
@@ -1,6 +1,6 @@
# temp. setup for testing RT migration to jessie
class role::requesttracker::upgradetest {
- system::role { 'role::requesttracker::upgradetest': description => 'temp
test setup for RT migration to jessie' }
+ system::role { 'requesttracker::upgradetest': description => 'temp test
setup for RT migration to jessie' }
include ::standard
include ::base::firewall
diff --git a/modules/role/manifests/requesttracker_server.pp
b/modules/role/manifests/requesttracker_server.pp
index 18ce6fc..53679d4 100644
--- a/modules/role/manifests/requesttracker_server.pp
+++ b/modules/role/manifests/requesttracker_server.pp
@@ -4,7 +4,7 @@
include ::standard
include ::profile::requesttracker::server
- system::role { 'role::requesttracker::server':
+ system::role { 'requesttracker::server':
description => 'RT server'
}
}
diff --git a/modules/role/manifests/sentry.pp b/modules/role/manifests/sentry.pp
index 7628c39..d432b7e 100644
--- a/modules/role/manifests/sentry.pp
+++ b/modules/role/manifests/sentry.pp
@@ -8,7 +8,7 @@
class role::sentry {
include ::sentry
- system::role { 'role::sentry':
+ system::role { 'sentry':
description => 'Sentry server (error aggregation & presentation
service)',
}
}
diff --git a/modules/role/manifests/snapshot/cronrunner.pp
b/modules/role/manifests/snapshot/cronrunner.pp
index a7397bd..03094ed 100644
--- a/modules/role/manifests/snapshot/cronrunner.pp
+++ b/modules/role/manifests/snapshot/cronrunner.pp
@@ -9,7 +9,7 @@
# cron jobs
class { '::snapshot::cron': user => 'datasets' }
- system::role { 'role::snapshot::cronrunner':
+ system::role { 'snapshot::cronrunner':
description => 'runner of misc dump-related cron jobs',
}
}
diff --git a/modules/role/manifests/snapshot/dumper.pp
b/modules/role/manifests/snapshot/dumper.pp
index 0ded129..06639e2 100644
--- a/modules/role/manifests/snapshot/dumper.pp
+++ b/modules/role/manifests/snapshot/dumper.pp
@@ -6,7 +6,7 @@
# cron job for running the dumps
class { 'snapshot::dumps::cron': user => 'datasets' }
- system::role { 'role::snapshot::dumper':
+ system::role { 'snapshot::dumper':
description => 'dumper of XML/SQL wiki content',
}
}
diff --git a/modules/role/manifests/snapshot/monitor.pp
b/modules/role/manifests/snapshot/monitor.pp
index f833d2d..c470213 100644
--- a/modules/role/manifests/snapshot/monitor.pp
+++ b/modules/role/manifests/snapshot/monitor.pp
@@ -5,7 +5,7 @@
# monitor job
include ::snapshot::dumps::monitor
- system::role { 'role::snapshot::monitor':
+ system::role { 'snapshot::monitor':
description => 'monitor of XML dumps',
}
}
diff --git a/modules/role/manifests/snapshot/testbed.pp
b/modules/role/manifests/snapshot/testbed.pp
index 0f32d66..f2abe90 100644
--- a/modules/role/manifests/snapshot/testbed.pp
+++ b/modules/role/manifests/snapshot/testbed.pp
@@ -5,7 +5,7 @@
class role::snapshot::testbed {
include role::snapshot::common
- system::role { 'role::snapshot::testbed':
+ system::role { 'snapshot::testbed':
description => 'testbed for dumps of XML/SQL wiki content',
}
}
diff --git a/modules/role/manifests/spare/system.pp
b/modules/role/manifests/spare/system.pp
index 847cc4f..05f0a96 100644
--- a/modules/role/manifests/spare/system.pp
+++ b/modules/role/manifests/spare/system.pp
@@ -11,5 +11,5 @@
include ::standard
include ::base::firewall
- system::role { 'role::spare::system': description => 'Unused spare system'
}
+ system::role { 'spare::system': description => 'Unused spare system' }
}
diff --git a/modules/role/manifests/statistics/cruncher.pp
b/modules/role/manifests/statistics/cruncher.pp
index 04da866..efba497 100644
--- a/modules/role/manifests/statistics/cruncher.pp
+++ b/modules/role/manifests/statistics/cruncher.pp
@@ -1,6 +1,6 @@
# (stat1003)
class role::statistics::cruncher inherits role::statistics::base {
- system::role { 'role::statistics::cruncher':
+ system::role { 'statistics::cruncher':
description => 'Statistics general compute node (non private data)'
}
diff --git a/modules/role/manifests/statistics/private.pp
b/modules/role/manifests/statistics/private.pp
index 5c600c1..c1ed5e4 100644
--- a/modules/role/manifests/statistics/private.pp
+++ b/modules/role/manifests/statistics/private.pp
@@ -1,6 +1,6 @@
# (stat1002)
class role::statistics::private inherits role::statistics::base {
- system::role { 'role::statistics::private':
+ system::role { 'statistics::private':
description => 'Statistics private data host and general compute node'
}
diff --git a/modules/role/manifests/statistics/web.pp
b/modules/role/manifests/statistics/web.pp
index 451972d..92b398a 100644
--- a/modules/role/manifests/statistics/web.pp
+++ b/modules/role/manifests/statistics/web.pp
@@ -1,6 +1,6 @@
# (thorium)
class role::statistics::web inherits role::statistics::base {
- system::role { 'role::statistics::web':
+ system::role { 'statistics::web':
description => 'Statistics private data host and general compute node'
}
diff --git a/modules/role/manifests/statsite.pp
b/modules/role/manifests/statsite.pp
index f5f9307..497a5aa 100644
--- a/modules/role/manifests/statsite.pp
+++ b/modules/role/manifests/statsite.pp
@@ -5,7 +5,7 @@
# Graphite or Ganglia. See <https://github.com/armon/statsite>.
#
class role::statsite {
- system::role { 'role::statsite':
+ system::role { 'statsite':
description => 'statsite server'
}
diff --git a/modules/role/manifests/swift/proxy.pp
b/modules/role/manifests/swift/proxy.pp
index a963f5a..4c5c41a 100644
--- a/modules/role/manifests/swift/proxy.pp
+++ b/modules/role/manifests/swift/proxy.pp
@@ -2,7 +2,7 @@
class role::swift::proxy (
$use_tls = hiera('role::swift::proxy::use_tls', false),
) {
- system::role { 'role::swift::proxy':
+ system::role { 'swift::proxy':
description => 'swift frontend proxy',
}
diff --git a/modules/role/manifests/swift/stats_reporter.pp
b/modules/role/manifests/swift/stats_reporter.pp
index f244d4b..15f710b 100644
--- a/modules/role/manifests/swift/stats_reporter.pp
+++ b/modules/role/manifests/swift/stats_reporter.pp
@@ -1,6 +1,6 @@
# filtertags: labs-project-deployment-prep
class role::swift::stats_reporter {
- system::role { 'role::swift::stats_reporter':
+ system::role { 'swift::stats_reporter':
description => 'swift statistics reporter',
}
diff --git a/modules/role/manifests/swift/storage.pp
b/modules/role/manifests/swift/storage.pp
index c5b6936..13e4674 100644
--- a/modules/role/manifests/swift/storage.pp
+++ b/modules/role/manifests/swift/storage.pp
@@ -1,6 +1,6 @@
# filtertags: labs-project-deployment-prep labs-project-swift
class role::swift::storage {
- system::role { 'role::swift::storage':
+ system::role { 'swift::storage':
description => 'swift storage brick',
}
diff --git a/modules/role/manifests/syslog/centralserver.pp
b/modules/role/manifests/syslog/centralserver.pp
index 2620bed..b3f4f0d 100644
--- a/modules/role/manifests/syslog/centralserver.pp
+++ b/modules/role/manifests/syslog/centralserver.pp
@@ -8,7 +8,7 @@
include ::base::firewall
include ::profile::backup::host
- system::role { 'role::syslog::centralserver':
+ system::role { 'syslog::centralserver':
description => 'Central syslog server'
}
diff --git a/modules/role/manifests/systemtap/devserver.pp
b/modules/role/manifests/systemtap/devserver.pp
index 23dc7db..54dc4ec 100644
--- a/modules/role/manifests/systemtap/devserver.pp
+++ b/modules/role/manifests/systemtap/devserver.pp
@@ -5,7 +5,7 @@
class role::systemtap::devserver {
include ::systemtap::devserver
- system::role { 'role::systemtap::devserver':
+ system::role { 'systemtap::devserver':
description => 'SystemTap development environment'
}
}
diff --git a/modules/role/manifests/tendril.pp
b/modules/role/manifests/tendril.pp
index 04aba9d..c8eba32 100644
--- a/modules/role/manifests/tendril.pp
+++ b/modules/role/manifests/tendril.pp
@@ -5,7 +5,7 @@
include ::base::firewall
include ::standard
- system::role { 'role::tendril': description => 'tendril server' }
+ system::role { 'tendril': description => 'tendril server' }
# T62183 | TODO/FIXME: remove hiera condition once T150771 is resolved
# aware that there should not be a permanent hiera lookup here
diff --git a/modules/role/manifests/test/system.pp
b/modules/role/manifests/test/system.pp
index 8cd4214..a98363a 100644
--- a/modules/role/manifests/test/system.pp
+++ b/modules/role/manifests/test/system.pp
@@ -5,5 +5,5 @@
include ::standard
include ::base::firewall
- system::role { 'role::test::system': description => 'Unpuppetised system
for testing' }
+ system::role { 'test::system': description => 'Unpuppetised system for
testing' }
}
diff --git a/modules/role/manifests/toollabs/bastion.pp
b/modules/role/manifests/toollabs/bastion.pp
index d6c972c..0c85b97 100644
--- a/modules/role/manifests/toollabs/bastion.pp
+++ b/modules/role/manifests/toollabs/bastion.pp
@@ -2,5 +2,5 @@
class role::toollabs::bastion {
include ::toollabs::bastion
- system::role { 'role::toollabs::bastion': description => 'Tool Labs
bastion' }
+ system::role { 'toollabs::bastion': description => 'Tool Labs bastion' }
}
diff --git a/modules/role/manifests/toollabs/checker.pp
b/modules/role/manifests/toollabs/checker.pp
index 5259555..9b88554 100644
--- a/modules/role/manifests/toollabs/checker.pp
+++ b/modules/role/manifests/toollabs/checker.pp
@@ -2,7 +2,7 @@
class role::toollabs::checker {
include ::toollabs::checker
- system::role { 'role::toollabs::checker':
+ system::role { 'toollabs::checker':
description => 'Exposes end points for external monitoring of internal
systems',
}
}
diff --git a/modules/role/manifests/toollabs/compute.pp
b/modules/role/manifests/toollabs/compute.pp
index 2a8b928..40fd604 100644
--- a/modules/role/manifests/toollabs/compute.pp
+++ b/modules/role/manifests/toollabs/compute.pp
@@ -2,5 +2,5 @@
class role::toollabs::compute {
include ::toollabs::compute
- system::role { 'role::toollabs::compute': description => 'Tool Labs
compute node' }
+ system::role { 'toollabs::compute': description => 'Tool Labs compute
node' }
}
diff --git a/modules/role/manifests/toollabs/cronrunner.pp
b/modules/role/manifests/toollabs/cronrunner.pp
index 617fc45..8f40636 100644
--- a/modules/role/manifests/toollabs/cronrunner.pp
+++ b/modules/role/manifests/toollabs/cronrunner.pp
@@ -2,7 +2,7 @@
class role::toollabs::cronrunner {
include ::toollabs::cronrunner
- system::role { 'role::toollabs::cronrunner':
+ system::role { 'toollabs::cronrunner':
description => 'Tool Labs cron starter host',
}
}
diff --git a/modules/role/manifests/toollabs/logging/centralserver.pp
b/modules/role/manifests/toollabs/logging/centralserver.pp
index 3425d01..a0a2e92 100644
--- a/modules/role/manifests/toollabs/logging/centralserver.pp
+++ b/modules/role/manifests/toollabs/logging/centralserver.pp
@@ -4,7 +4,7 @@
class role::toollabs::logging::centralserver {
include ::base::firewall
- system::role { 'role::tools::logreceiver':
+ system::role { 'tools::logreceiver':
description => 'Central syslog server',
}
diff --git a/modules/role/manifests/toollabs/mailrelay.pp
b/modules/role/manifests/toollabs/mailrelay.pp
index 0783936..9ed6aa1 100644
--- a/modules/role/manifests/toollabs/mailrelay.pp
+++ b/modules/role/manifests/toollabs/mailrelay.pp
@@ -1,6 +1,6 @@
# filtertags: labs-project-tools
class role::toollabs::mailrelay {
- system::role { 'role::toollabs::mailrelay': description => 'Tool Labs mail
relay' }
+ system::role { 'toollabs::mailrelay': description => 'Tool Labs mail
relay' }
include ::toollabs::mailrelay
}
diff --git a/modules/role/manifests/toollabs/master.pp
b/modules/role/manifests/toollabs/master.pp
index fff2514..eaafb7a 100644
--- a/modules/role/manifests/toollabs/master.pp
+++ b/modules/role/manifests/toollabs/master.pp
@@ -2,5 +2,5 @@
class role::toollabs::master {
include ::toollabs::master
- system::role { 'role::toollabs::master': description => 'Tool Labs
gridengine master' }
+ system::role { 'toollabs::master': description => 'Tool Labs gridengine
master' }
}
diff --git a/modules/role/manifests/toollabs/proxy.pp
b/modules/role/manifests/toollabs/proxy.pp
index 8a16346..be70d49 100644
--- a/modules/role/manifests/toollabs/proxy.pp
+++ b/modules/role/manifests/toollabs/proxy.pp
@@ -22,5 +22,5 @@
desc => 'HTTPS webserver for the entire world',
}
- system::role { 'role::toollabs::proxy': description => 'Tool labs generic
web proxy' }
+ system::role { 'toollabs::proxy': description => 'Tool labs generic web
proxy' }
}
diff --git a/modules/role/manifests/toollabs/services.pp
b/modules/role/manifests/toollabs/services.pp
index 068bbf3..e21b992 100644
--- a/modules/role/manifests/toollabs/services.pp
+++ b/modules/role/manifests/toollabs/services.pp
@@ -2,7 +2,7 @@
class role::toollabs::services(
$active_host = 'tools-services-01.tools.eqiad.wmflabs',
) {
- system::role { 'role::toollabs::services':
+ system::role { 'toollabs::services':
description => 'Tool Labs manifest based services',
}
diff --git a/modules/role/manifests/toollabs/shadow.pp
b/modules/role/manifests/toollabs/shadow.pp
index d44a7c0..f16c2a6 100644
--- a/modules/role/manifests/toollabs/shadow.pp
+++ b/modules/role/manifests/toollabs/shadow.pp
@@ -1,6 +1,6 @@
# filtertags: labs-project-tools
class role::toollabs::shadow {
- system::role { 'role::toollabs::shadow': description => 'Tool Labs
gridengine shadow (backup) master' }
+ system::role { 'toollabs::shadow': description => 'Tool Labs gridengine
shadow (backup) master' }
class { '::toollabs::shadow':
gridmaster => $role::toollabs::common::gridmaster,
diff --git a/modules/role/manifests/toollabs/static.pp
b/modules/role/manifests/toollabs/static.pp
index 3692455..4c18c21 100644
--- a/modules/role/manifests/toollabs/static.pp
+++ b/modules/role/manifests/toollabs/static.pp
@@ -2,7 +2,7 @@
class role::toollabs::static {
include ::toollabs::static
- system::role { 'role::toollabs::static':
+ system::role { 'toollabs::static':
description => 'Tool Labs static http server',
}
}
diff --git a/modules/role/manifests/tor_relay.pp
b/modules/role/manifests/tor_relay.pp
index 0d289bf..651b115 100644
--- a/modules/role/manifests/tor_relay.pp
+++ b/modules/role/manifests/tor_relay.pp
@@ -4,7 +4,7 @@
include ::base::firewall
include ::profile::tor::relay
- system::role { 'role::tor_relay':
+ system::role { 'tor_relay':
description => 'Tor relay'
}
}
diff --git a/modules/role/manifests/trendingedits.pp
b/modules/role/manifests/trendingedits.pp
index e95468d..7716f0c 100644
--- a/modules/role/manifests/trendingedits.pp
+++ b/modules/role/manifests/trendingedits.pp
@@ -4,7 +4,7 @@
$kafka_config = kafka_config('main')
$port = 6699
- system::role { 'role::trendingedits':
+ system::role { 'trendingedits':
description => 'computes the list of currently-trending articles',
}
diff --git a/modules/role/manifests/wdqs.pp b/modules/role/manifests/wdqs.pp
index 53e19ab..a58de6b 100644
--- a/modules/role/manifests/wdqs.pp
+++ b/modules/role/manifests/wdqs.pp
@@ -13,7 +13,7 @@
include role::labs::lvm::srv
}
- system::role { 'role::wdqs':
+ system::role { 'wdqs':
ensure => 'present',
description => 'Wikidata Query Service',
}
diff --git a/modules/role/manifests/webserver_misc_static.pp
b/modules/role/manifests/webserver_misc_static.pp
index 03a6c96..dce200e 100644
--- a/modules/role/manifests/webserver_misc_static.pp
+++ b/modules/role/manifests/webserver_misc_static.pp
@@ -14,7 +14,7 @@
include ::profile::microsites::static_bugzilla #
https://static-bugzilla.wikimedia.org
include ::profile::microsites::transparency #
https://transparency.wikimedia.org
- system::role { 'role::microsites::webserver_misc_static':
+ system::role { 'webserver_misc_static':
description => 'WMF misc sites web server'
}
}
diff --git a/modules/role/manifests/xhgui/app.pp
b/modules/role/manifests/xhgui/app.pp
index 345c397..d5719b0 100644
--- a/modules/role/manifests/xhgui/app.pp
+++ b/modules/role/manifests/xhgui/app.pp
@@ -39,7 +39,7 @@
],
}
- system::role { 'role::xhgui::app': }
+ system::role { 'xhgui::app': }
require_package('php5-mongo')
diff --git a/modules/role/manifests/yubiauth_server.pp
b/modules/role/manifests/yubiauth_server.pp
index effb45f..8c4c7d0 100644
--- a/modules/role/manifests/yubiauth_server.pp
+++ b/modules/role/manifests/yubiauth_server.pp
@@ -1,6 +1,6 @@
class role::yubiauth_server {
- system::role { 'role::yubiauth_server':
+ system::role { 'yubiauth_server':
ensure => 'present',
description => 'Yubi 2FA authentication server',
}
diff --git a/modules/role/manifests/zookeeper/server.pp
b/modules/role/manifests/zookeeper/server.pp
index 956a5f9..dc073c0 100644
--- a/modules/role/manifests/zookeeper/server.pp
+++ b/modules/role/manifests/zookeeper/server.pp
@@ -20,7 +20,7 @@
include role::zookeeper::client
$cluster_name = $::role::zookeeper::client::cluster_name
- system::role { 'role::zookeeper::server':
+ system::role { 'zookeeper::server':
description => "${cluster_name} Cluster Zookeeper Server"
}
diff --git a/modules/role/manifests/zuul/merger.pp
b/modules/role/manifests/zuul/merger.pp
index 46764b9..7f0c16b 100644
--- a/modules/role/manifests/zuul/merger.pp
+++ b/modules/role/manifests/zuul/merger.pp
@@ -1,5 +1,5 @@
class role::zuul::merger {
- system::role { 'role::zuul::merger': description => 'Zuul merger' }
+ system::role { 'zuul::merger': description => 'Zuul merger' }
include ::zuul::monitoring::merger
diff --git a/modules/role/manifests/zuul/server.pp
b/modules/role/manifests/zuul/server.pp
index 5555d67..df97f01 100644
--- a/modules/role/manifests/zuul/server.pp
+++ b/modules/role/manifests/zuul/server.pp
@@ -1,6 +1,6 @@
# filtertags: labs-project-ci-staging
class role::zuul::server {
- system::role { 'role::zuul::server': description => 'Zuul server
(scheduler)' }
+ system::role { 'zuul::server': description => 'Zuul server (scheduler)' }
include contint::proxy_zuul
diff --git a/modules/system/manifests/role.pp b/modules/system/manifests/role.pp
index 89f66f5..c2cc496 100644
--- a/modules/system/manifests/role.pp
+++ b/modules/system/manifests/role.pp
@@ -13,7 +13,7 @@
#
# === Example
#
-# system::role { 'role::analytics::hadoop::master':
+# system::role { 'analytics::hadoop::master':
# description => 'Hadoop Master (NameNode & ResourceManager)'
# }
#
diff --git a/utils/new_wmf_service.py b/utils/new_wmf_service.py
index 6ddd924..47b7fc5 100755
--- a/utils/new_wmf_service.py
+++ b/utils/new_wmf_service.py
@@ -195,7 +195,7 @@
# Role class for %(name)s
class role::%(name)s {
- system::role { 'role::%(name)s':
+ system::role { '%(name)s':
description => '%(description)s',
}
--
To view, visit https://gerrit.wikimedia.org/r/354172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43a208fdc616e4d3e2ad0c1905252f7f19019b40
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
