Jcrespo has submitted this change and it was merged.

Change subject: Enabling ssl and ferm on parsercaches, disabling 
performance_schema
......................................................................


Enabling ssl and ferm on parsercaches, disabling performance_schema

Change-Id: I22a535586803b271362cf44126edfbe9129df2fe
References: T120122
---
M manifests/role/mariadb.pp
M manifests/site.pp
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 61c7da0..d33ddeb 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -743,6 +743,7 @@
 
     include role::mariadb::grants::core
     include role::mariadb::monitor
+    include role::mariadb::ferm
     include passwords::misc::scripts
 
     system::role { 'role::mariadb::parsercache':
@@ -756,6 +757,7 @@
     class { 'role::mariadb::grants':
         shard => 'parsercache',
     }
+
     $basedir = $hostname ? {
         /pc100[123]/ => '/a',
         default      => '/srv',
@@ -767,6 +769,8 @@
         password => $passwords::misc::scripts::mysql_root_pass,
         datadir  => "${basedir}/sqldata-cache",
         tmpdir   => "${basedir}/tmp",
+        ssl      => 'on',
+        p_s      => 'off',
     }
 
     # mysql monitoring access from tendril (db1011)
diff --git a/manifests/site.pp b/manifests/site.pp
index 3de525d..fd9fe71 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2204,10 +2204,12 @@
 # eqiad
 node /pc100[4-6]\.eqiad\.wmnet/ {
     role mariadb::parsercache
+    include base::firewall
 }
 # codfw
 node /pc200[4-6]\.codfw\.wmnet/ {
     role mariadb::parsercache
+    include base::firewall
 }
 
 # virtual machine hosting 
https://wikitech.wikimedia.org/wiki/Planet.wikimedia.org

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

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

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

Reply via email to