Jcrespo has submitted this change and it was merged.
Change subject: mariadb: Disable /root/.my.cnf and grants distribution to all
dbs
......................................................................
mariadb: Disable /root/.my.cnf and grants distribution to all dbs
Bug: T146146
Change-Id: Icfa59ffd4f25739b957ed758306f019f0ca8d209
---
M manifests/role/mariadb.pp
M modules/mariadb
2 files changed, 28 insertions(+), 27 deletions(-)
Approvals:
Jcrespo: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index aafa9cc..a3371ed 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -30,32 +30,33 @@
$tendril_pass = $passwords::tendril::db_pass
$prometheus_pass = $passwords::prometheus::db_pass
- file { '/etc/mysql/production-grants.sql':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0400',
- content => template('mariadb/production-grants.sql.erb'),
- }
-
- if $shard {
- $nodepool_pass = $passwords::nodepool::nodepooldb_pass
- $testreduce_pass = $passwords::testreduce::mysql::db_pass
- $testreduce_cli_pass = $passwords::testreduce::mysql::mysql_client_pass
- $racktables_user = $passwords::racktables::racktables_db_user
- $racktables_pass = $passwords::racktables::racktables_db_pass
- $servermon_pass = $passwords::servermon::db_password
- $striker_pass = $passwords::striker::application_db_password
- $striker_admin_pass = $passwords::striker::admin_db_password
-
- file { '/etc/mysql/production-grants-shard.sql':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0400',
- content => template("mariadb/production-grants-${shard}.sql.erb"),
- }
- }
+ # disabled until T146146 is clarified
+ #file { '/etc/mysql/production-grants.sql':
+ # ensure => present,
+ # owner => 'root',
+ # group => 'root',
+ # mode => '0400',
+ # content => template('mariadb/production-grants.sql.erb'),
+ #}
+ #
+ #if $shard {
+ # $nodepool_pass = $passwords::nodepool::nodepooldb_pass
+ # $testreduce_pass = $passwords::testreduce::mysql::db_pass
+ # $testreduce_cli_pass =
$passwords::testreduce::mysql::mysql_client_pass
+ # $racktables_user = $passwords::racktables::racktables_db_user
+ # $racktables_pass = $passwords::racktables::racktables_db_pass
+ # $servermon_pass = $passwords::servermon::db_password
+ # $striker_pass = $passwords::striker::application_db_password
+ # $striker_admin_pass = $passwords::striker::admin_db_password
+ #
+ # file { '/etc/mysql/production-grants-shard.sql':
+ # ensure => present,
+ # owner => 'root',
+ # group => 'root',
+ # mode => '0400',
+ # content => template("mariadb/production-grants-${shard}.sql.erb"),
+ # }
+ #}
}
class role::mariadb::ferm {
diff --git a/modules/mariadb b/modules/mariadb
index 1b846eb..1b9f13b 160000
--- a/modules/mariadb
+++ b/modules/mariadb
@@ -1 +1 @@
-Subproject commit 1b846eb222a81120af0c995df97afd57751b3e04
+Subproject commit 1b9f13b11f4f69173a7d73adf5aef165567db6ce
--
To view, visit https://gerrit.wikimedia.org/r/311720
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icfa59ffd4f25739b957ed758306f019f0ca8d209
Gerrit-PatchSet: 3
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
