Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: puppetmasters: introduce a 'puppet' cluster, assign to all 
masters
......................................................................

puppetmasters: introduce a 'puppet' cluster, assign to all masters

Change-Id: Ib2f32925ded146a0cd968aed5e31bdb21756566d
---
M hieradata/common.yaml
M hieradata/common/monitoring.yaml
M hieradata/role/common/puppetmaster/backend.yaml
M hieradata/role/common/puppetmaster/frontend.yaml
4 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/312196/1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index b775844..7e595e3 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -24,6 +24,12 @@
       codfw: []
       esams: []
       ulsfo: []
+  puppet:
+    name: "Puppetmasters"
+    id: 3
+    sites:
+      eqiad: []
+      codfw: []
   search:
     name: "Search"
     id: 4
diff --git a/hieradata/common/monitoring.yaml b/hieradata/common/monitoring.yaml
index 307cad2..54b1207 100644
--- a/hieradata/common/monitoring.yaml
+++ b/hieradata/common/monitoring.yaml
@@ -147,6 +147,12 @@
   ocg_eqiad:
     description: offline content generator eqiad
 
+# Puppet
+  puppet_eqiad:
+    description: Puppetmasters eqiad
+  puppet_codfw:
+    description: Puppetmasters codfw
+
 # Parsoid
   parsoid_eqiad:
     description: eqiad parsoid servers
diff --git a/hieradata/role/common/puppetmaster/backend.yaml 
b/hieradata/role/common/puppetmaster/backend.yaml
index fb0befd..5d1e3ce 100644
--- a/hieradata/role/common/puppetmaster/backend.yaml
+++ b/hieradata/role/common/puppetmaster/backend.yaml
@@ -9,3 +9,4 @@
   - codfw.wmnet
   - esams.wmnet
   - ulsfo.wmnet
+cluster: puppet
diff --git a/hieradata/role/common/puppetmaster/frontend.yaml 
b/hieradata/role/common/puppetmaster/frontend.yaml
index 18bedc2..e63117d 100644
--- a/hieradata/role/common/puppetmaster/frontend.yaml
+++ b/hieradata/role/common/puppetmaster/frontend.yaml
@@ -13,3 +13,4 @@
 confd::monitor_files: false
 apache::logrotate::period: "daily"
 apache::logrotate::rotate: 7
+cluster: puppet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2f32925ded146a0cd968aed5e31bdb21756566d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>

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

Reply via email to