Andrew Bogott has submitted this change and it was merged.

Change subject: site.pp: remove "include admin"s
......................................................................


site.pp: remove "include admin"s

Just a few random nodes have this include,
it doesn't look like that is actually needed,
so remove it to simplify site.pp.

Removing it from them also shows as no-op in puppet compiler.

Change-Id: I23471f5a353ac4d9dc476e7e88d1f18e288c08d1
---
M manifests/site.pp
1 file changed, 0 insertions(+), 4 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index 8507914..29b008f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -292,7 +292,6 @@
 node 'copper.eqiad.wmnet' {
     role(package::builder)
     include standard
-    include admin
 }
 
 # cp1008: prod-like SSL test host
@@ -1105,7 +1104,6 @@
 
     role(dumps::zim)
     include standard
-    include admin
 }
 
 # Continuous Integration
@@ -1130,7 +1128,6 @@
 node /^ganeti[12]00[0-9]\.(codfw|eqiad)\.wmnet$/ {
     role(ganeti)
     include standard
-    include admin
 }
 
 # Hosts visualization / monitoring of EventLogging event streams
@@ -2273,7 +2270,6 @@
     role(notebook::server)
 
     include standard
-    include admin
 }
 
 # salt master

-- 
To view, visit https://gerrit.wikimedia.org/r/315887
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I23471f5a353ac4d9dc476e7e88d1f18e288c08d1
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <a...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to