Jcrespo has submitted this change and it was merged.

Change subject: labsdb: stop using role::mariadb::grants, only used for 
production
......................................................................


labsdb: stop using role::mariadb::grants, only used for production

Custom prompt, passwords and or grants should be handled
independently from the ones on production (core).

Bug: T146146
Change-Id: Ib78d42ab953e39009c3f0cfa4c6974cba3d936a0
---
M modules/role/manifests/labs/db/master.pp
M modules/role/manifests/labs/db/replica.pp
M modules/role/manifests/labs/db/slave.pp
3 files changed, 0 insertions(+), 9 deletions(-)

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



diff --git a/modules/role/manifests/labs/db/master.pp 
b/modules/role/manifests/labs/db/master.pp
index f9fc9b5..177b5b6 100644
--- a/modules/role/manifests/labs/db/master.pp
+++ b/modules/role/manifests/labs/db/master.pp
@@ -8,7 +8,6 @@
     class { 'mariadb::packages_wmf':
         mariadb10 => false
     }
-    include role::mariadb::grants
     include role::mariadb::monitor
     include passwords::misc::scripts
 
@@ -19,9 +18,7 @@
     }
 
     class { 'mariadb::config':
-        prompt    => 'TOOLSDB master',
         config    => 'mariadb/tools.my.cnf.erb',
-        password  => $passwords::misc::scripts::mysql_root_pass,
         datadir   => '/srv/labsdb/data',
         tmpdir    => '/tmp',
         read_only => 'OFF',
diff --git a/modules/role/manifests/labs/db/replica.pp 
b/modules/role/manifests/labs/db/replica.pp
index 4a6df6b..b731be9 100644
--- a/modules/role/manifests/labs/db/replica.pp
+++ b/modules/role/manifests/labs/db/replica.pp
@@ -8,7 +8,6 @@
     class { 'mariadb::packages_wmf':
         mariadb10 => true
     }
-    include role::mariadb::grants
     include role::mariadb::monitor
     include base::firewall
     include role::mariadb::ferm
@@ -21,9 +20,7 @@
     }
 
     class { 'mariadb::config':
-        prompt        => 'REPLICA database',
         config        => 'mariadb/labsdb-replica.my.cnf.erb',
-        password      => $passwords::misc::scripts::mysql_root_pass,
         datadir       => '/srv/sqldata',
         tmpdir        => '/srv/tmp',
         read_only     => 'ON',
diff --git a/modules/role/manifests/labs/db/slave.pp 
b/modules/role/manifests/labs/db/slave.pp
index fffbf5b..38aa671 100644
--- a/modules/role/manifests/labs/db/slave.pp
+++ b/modules/role/manifests/labs/db/slave.pp
@@ -8,7 +8,6 @@
     class { 'mariadb::packages_wmf':
         mariadb10 => true
     }
-    include role::mariadb::grants
     include role::mariadb::monitor
     include role::mariadb::ferm
     include passwords::misc::scripts
@@ -20,9 +19,7 @@
     }
 
     class { 'mariadb::config':
-        prompt        => 'TOOLSDB slave',
         config        => 'mariadb/tools.my.cnf.erb',
-        password      => $passwords::misc::scripts::mysql_root_pass,
         datadir       => '/srv/labsdb/data',
         tmpdir        => '/srv/labsdb/tmp',
         read_only     => 'ON',

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

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