Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/353121 )
Change subject: poolcounter: move 'include standard' to role
......................................................................
poolcounter: move 'include standard' to role
Change-Id: I221f6cdae9fb62e8dc291732405592a118453b6f
---
M manifests/site.pp
M modules/role/manifests/poolcounter/server.pp
2 files changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/353121/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 1aa3222..2bba3f4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2336,12 +2336,10 @@
node 'poolcounter1001.eqiad.wmnet' {
role(poolcounter::server)
- include ::standard
}
node 'poolcounter1002.eqiad.wmnet' {
role(poolcounter::server)
- include ::standard
}
node /^prometheus200[34]\.codfw\.wmnet$/ {
@@ -2650,7 +2648,6 @@
# codfw poolcounters
node /(subra|suhail)\.codfw\.wmnet/ {
role(poolcounter::server)
- include ::standard
}
# mediawiki maintenance servers (https://wikitech.wikimedia.org/wiki/Terbium)
diff --git a/modules/role/manifests/poolcounter/server.pp
b/modules/role/manifests/poolcounter/server.pp
index 37dad8d..0195d29 100644
--- a/modules/role/manifests/poolcounter/server.pp
+++ b/modules/role/manifests/poolcounter/server.pp
@@ -1,5 +1,6 @@
# filtertags: labs-project-deployment-prep
class role::poolcounter::server {
+ include ::standard
include ::poolcounter
include ::base::firewall
--
To view, visit https://gerrit.wikimedia.org/r/353121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I221f6cdae9fb62e8dc291732405592a118453b6f
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
