Marostegui has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/326086 )

Change subject: mariadb: Added gtid_domain_id to its own variable
......................................................................


mariadb: Added gtid_domain_id to its own variable

We were using server_id variable for gtid_domain_id, but it is
better to make them independent, so we can change any of them in the
future without affecting the other one.

Once that is done, changing the variable in the misc shard hosts
to use the new variable.

More info: https://gerrit.wikimedia.org/r/#/c/326080/

Bug: T149418
Change-Id: I055849e3944743118e89950a57584b22837573ec
---
M modules/mariadb
M templates/mariadb/misc.my.cnf.erb
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Marostegui: Looks good to me, approved
  jenkins-bot: Verified
  Jcrespo: Looks good to me, but someone else must approve



diff --git a/modules/mariadb b/modules/mariadb
index c50a383..729063a 160000
--- a/modules/mariadb
+++ b/modules/mariadb
@@ -1 +1 @@
-Subproject commit c50a3838bf31526c0e2392908b16ec009682cd34
+Subproject commit 729063a0eed1b6c056b06266551fc5440d3524d7
diff --git a/templates/mariadb/misc.my.cnf.erb 
b/templates/mariadb/misc.my.cnf.erb
index d58bd51..e1728c3 100644
--- a/templates/mariadb/misc.my.cnf.erb
+++ b/templates/mariadb/misc.my.cnf.erb
@@ -97,7 +97,7 @@
 # masters but for consistency it should be set in all of them.
 # https://mariadb.com/kb/en/mariadb/gtid/
 
-gtid_domain_id  = <%= @server_id %>
+gtid_domain_id  = <%= @gtid_domain_id %>
 
 <% if @ssl == 'on' %>
 # ssl

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I055849e3944743118e89950a57584b22837573ec
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui <maroste...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Marostegui <maroste...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@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