Jcrespo has submitted this change and it was merged.
Change subject: Fix missing include; fix wrong positioning or prometheus account
......................................................................
Fix missing include; fix wrong positioning or prometheus account
No issues were caused, as puppet does not talk to mysql directly.
Change-Id: Ieb2944adef4465d113b84ecc975d46fee053cad4
---
M manifests/role/mariadb.pp
1 file changed, 7 insertions(+), 6 deletions(-)
Approvals:
Jcrespo: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 31e4c77..e03f50c 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -20,12 +20,14 @@
include passwords::testreduce::mysql
include passwords::racktables
include passwords::prometheus
+ include passwords::servermon
$root_pass = $passwords::misc::scripts::mysql_root_pass
$repl_pass = $passwords::misc::scripts::mysql_repl_pass
$nagios_pass = $passwords::misc::scripts::nagios_sql_pass
$tendril_user = $passwords::tendril::db_user
$tendril_pass = $passwords::tendril::db_pass
+ $prometheus_pass = $passwords::prometheus::db_pass
file { '/etc/mysql/production-grants.sql':
ensure => present,
@@ -36,13 +38,12 @@
}
if $shard {
- $nodepool_pass = $passwords::nodepool::nodepooldb_pass
- $testreduce_pass = $passwords::testreduce::mysql::db_pass
+ $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
- $prometheus_pass = $passwords::prometheus::db_pass
- $servermon_pass = $passwords::servermon::db_password
+ $racktables_user = $passwords::racktables::racktables_db_user
+ $racktables_pass = $passwords::racktables::racktables_db_pass
+ $servermon_pass = $passwords::servermon::db_password
file { '/etc/mysql/production-grants-shard.sql':
ensure => present,
--
To view, visit https://gerrit.wikimedia.org/r/301353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb2944adef4465d113b84ecc975d46fee053cad4
Gerrit-PatchSet: 2
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
