[MediaWiki-commits] [Gerrit] all snapshot hosts using snapshot module - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: all snapshot hosts using snapshot module
......................................................................

all snapshot hosts using snapshot module

Change-Id: If30a7ecfe1027c7ba2f375f0286a1b5d62359d01
---
M manifests/site.pp
1 file changed, 9 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/118258/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 9b31eaf..f9b0ca2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -24,7 +24,6 @@
 import 'role/*.pp'
 import 'role/analytics/*.pp'
 import 'search.pp'
-import 'snapshots.pp'
 import 'sudo.pp'
 import 'swift.pp'
 import 'webserver.pp'
@@ -2473,30 +2472,23 @@
     include role::analytics::clients
 }
 
-node /^snapshot([1-3]\.pmtpa|100[1-4]\.eqiad)\.wmnet/ {
+node /^snapshot([1-3]\.pmtpa|100[124]\.eqiad)\.wmnet/ {
     $gid= '500'
-    include base
-    include ntp::client
-    include ganglia
-    include mediawiki::sync
-    include snapshots::packages
-    include snapshots::sync
-    include snapshots::files
-    include snapshots::noapache
-    include sudo::appserver
-    include admins::roots
-    include admins::mortals
-    include accounts::datasets
-    include nfs::data
-    include groups::wikidev
+    include snapshot
 }
 
-node /^snapshot4.pmtpa.wmnet/ {
+node 'snapshot4.pmtpa.wmnet' {
     $gid= '500'
     include snapshot
     include role::snapshot::cron::secondary
 }
 
+node 'snapshot1003.eqiad.wmnet' {
+    $gid= '500'
+    include snapshot
+    include role::snapshot::cron::primary
+}
+
 node 'terbium.eqiad.wmnet' {
     include role::applicationserver::maintenance
     include role::db::maintenance

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If30a7ecfe1027c7ba2f375f0286a1b5d62359d01
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>

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