[MediaWiki-commits] [Gerrit] Enable pt-heartbeat on all misc master (except m1) - change (operations/puppet)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Enable pt-heartbeat on all misc master (except m1)
......................................................................

Enable pt-heartbeat on all misc master (except m1)

After testing the heartbeat functionality on m5, add it to all
misc shards. This a previous step to enable it fleet-wide.

Bug: T114752
Change-Id: I7334b182f3b14a5dd79c7db6ff6b33a79efbea71
---
M manifests/role/mariadb.pp
M manifests/site.pp
2 files changed, 17 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/274640/1

diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 2720702..cccdc6f 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -131,7 +131,7 @@
         shard => $shard,
     }
 
-    if ($master and $shard == 'm5') {
+    if $master {
         class { 'mariadb::heartbeat':
             shard => $shard,
         }
@@ -207,6 +207,12 @@
         include coredb_mysql::snapshot
     }
 
+    if $master {
+        class { 'mariadb::heartbeat':
+            shard => $shard,
+        }
+    }
+
     unless $master {
         mariadb::monitor_replication { [ $shard ]:
             multisource => false,
@@ -254,6 +260,12 @@
 
     class { 'role::mariadb::grants':
         shard => $shard,
+    }
+
+    if $master {
+        class { 'mariadb::heartbeat':
+            shard => $shard,
+        }
     }
 }
 
@@ -382,6 +394,7 @@
         contact_group => 'admins', # only show on nagios/irc
     }
 }
+
 class role::mariadb::analytics::custom_repl_slave {
 
     file { '/usr/local/bin/eventlogging_sync.sh':
diff --git a/manifests/site.pp b/manifests/site.pp
index 2afb843..e424c98 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -670,7 +670,6 @@
 node 'db1016.eqiad.wmnet' {
     class { 'role::mariadb::misc':
         shard  => 'm1',
-        master => true,
     }
 }
 
@@ -684,9 +683,10 @@
 }
 
 ## m2 shard
-node /^db10(20)\.eqiad\.wmnet/ {
+node 'db1020.eqiad.wmnet' {
     class { 'role::mariadb::misc':
-        shard => 'm2',
+        shard  => 'm2',
+        master => true,
     }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7334b182f3b14a5dd79c7db6ff6b33a79efbea71
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>

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