Volans has submitted this change and it was merged.

Change subject: MariaDB: Use Puppet certs for s2
......................................................................


MariaDB: Use Puppet certs for s2

Use Puppet certs for cross-dc replica for shard s2, with the optional
generated CA with multiple PEMs to validate the legacy certificate of
eqiad master.

Bug: T111654
Change-Id: I11d9af0a19f797b2694e8b8df97ba60d7a5e3f8f
---
M manifests/site.pp
1 file changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 0e8aeb4..b533d89 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -513,7 +513,17 @@
     include base::firewall
 }
 
-node /^db20(17|35|41|49|56|63|64)\.codfw\.wmnet/ {
+node /^db20(17)\.codfw\.wmnet/ {
+    class { 'role::mariadb::core':
+        shard         => 's2',
+        p_s           => 'on',
+        binlog_format => 'ROW',
+        ssl           => 'multiple-ca',
+    }
+    include base::firewall
+}
+
+node /^db20(35|41|49|56|63|64)\.codfw\.wmnet/ {
     class { 'role::mariadb::core':
         shard         => 's2',
         p_s           => 'on',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11d9af0a19f797b2694e8b8df97ba60d7a5e3f8f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to