Muehlenhoff has submitted this change and it was merged.

Change subject: graphite1001: Use the role keyword
......................................................................


graphite1001: Use the role keyword

We need this for Hiera-based assignment of Salt grains for debdeploy

Change-Id: Ie48f1def731e668f7fc09a530b994fc8dc87e5c9
---
M manifests/site.pp
1 file changed, 1 insertion(+), 6 deletions(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index c5bb773..20d4e9c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1106,13 +1106,8 @@
 
 # Primary graphite machines, replacing tungsten
 node 'graphite1001.eqiad.wmnet' {
+    role graphite::production, statsdlb, gdash, performance, 
graphite::production::alerts, restbase::alerts
     include standard
-    include role::graphite::production
-    include role::statsdlb
-    include role::gdash
-    include role::performance
-    include role::graphite::production::alerts
-    include role::restbase::alerts
 }
 
 # graphite test machine, currently with SSD caching + spinning disks

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie48f1def731e668f7fc09a530b994fc8dc87e5c9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to