Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315880

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(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/315880/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 6b7f891..b3fb9e6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -239,7 +239,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
@@ -2538,19 +2537,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, prometheus::node_exporter)
-    include standard
 }
 
 # network insights (netflow/pmacct, etc.)
diff --git a/modules/role/manifests/restbase/server.pp 
b/modules/role/manifests/restbase/server.pp
index d3971ba..9d5e30f 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: newchange
Gerrit-Change-Id: I20c4b55b4e814fa5fa7826090be09c3f5e3bac6e
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

Reply via email to