Dzahn has submitted this change and it was merged.
Change subject: restbase: move standard include to role
......................................................................
restbase: move standard include to role
Move the "include standard" into the restbase::server
role and remove it from node level. Simplify site.pp.
Change-Id: I20c4b55b4e814fa5fa7826090be09c3f5e3bac6e
---
M manifests/site.pp
M modules/role/manifests/restbase/server.pp
2 files changed, 1 insertion(+), 4 deletions(-)
Approvals:
Dzahn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 90311a6..ffd5162 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -249,7 +249,6 @@
# cerium, praseodymium and xenon are Cassandra test hosts
node /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/ {
role(restbase::server, cassandra, prometheus::node_exporter)
- include standard
}
# DNS recursor
@@ -2522,19 +2521,16 @@
# restbase eqiad cluster
node /^restbase10[01][0-9]\.eqiad\.wmnet$/ {
role(restbase::server, cassandra)
- include standard
}
# restbase codfw cluster
node /^restbase200[1-9]\.codfw\.wmnet$/ {
role(restbase::server, cassandra)
- include standard
}
# cassandra multi-dc temporary test T111382
node /^restbase-test200[1-3]\.codfw\.wmnet$/ {
role(restbase::server, cassandra)
- include standard
}
# network insights (netflow/pmacct, etc.)
diff --git a/modules/role/manifests/restbase/server.pp
b/modules/role/manifests/restbase/server.pp
index 341296c..0c4ec53 100644
--- a/modules/role/manifests/restbase/server.pp
+++ b/modules/role/manifests/restbase/server.pp
@@ -5,6 +5,7 @@
include ::passwords::cassandra
include base::firewall
+ include standard
include ::restbase
include ::restbase::monitoring
--
To view, visit https://gerrit.wikimedia.org/r/315880
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I20c4b55b4e814fa5fa7826090be09c3f5e3bac6e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
