Springle has submitted this change and it was merged.

Change subject: Use full IPv4 address to generate MariaDB server_id.
......................................................................


Use full IPv4 address to generate MariaDB server_id.

The old method skiped the scond octet resulting in possible
server_id clashes between eqiad and codfw. Eventually it would
hurt in some surprising way.

Change-Id: I28e87927d072a93caefe0d4fe7c3b4a585b017e8
---
M manifests/config.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/config.pp b/manifests/config.pp
index 5b8089c..ec56643 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -12,7 +12,7 @@
     ) {
 
     $server_id = inline_template(
-        "<%= ia = @ipaddress.split('.'); server_id = ia[0] + ia[2] + ia[3]; 
server_id %>"
+        "<%= @ipaddress.split('.').inject(0) {|total,value| (total << 8 ) + 
value.to_i} %>"
     )
 
     file { '/etc/my.cnf':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28e87927d072a93caefe0d4fe7c3b4a585b017e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/mariadb
Gerrit-Branch: master
Gerrit-Owner: Springle <sprin...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Springle <sprin...@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