Ottomata has submitted this change and it was merged.
Change subject: Move custom researcher group researchdb password file
definition into node definition
......................................................................
Move custom researcher group researchdb password file definition into node
definition
This should only be on nodes that have the 'researchers' group included.
Change-Id: If47ec117caee8ccdbe7dc6b9185de70818d78f1f
---
M manifests/role/statistics.pp
M manifests/site.pp
M modules/statistics/manifests/compute.pp
3 files changed, 11 insertions(+), 8 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp
index 1a78fc0..f2187f1 100644
--- a/manifests/role/statistics.pp
+++ b/manifests/role/statistics.pp
@@ -143,6 +143,7 @@
# include stuff common to statistics compute nodes
include statistics::compute
+
#
# # Aaron Halfaker (halfak) wants MongoDB for his project.
# class { 'mongodb':
diff --git a/manifests/site.pp b/manifests/site.pp
index b9199da..ef6d11a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2306,6 +2306,16 @@
'researchers',
],
}
+
+ include passwords::mysql::research
+ # This file will render at
+ # /etc/mysql/conf.d/research-client.cnf.
+ mysql::config::client { 'research':
+ user => $::passwords::mysql::research::user,
+ pass => $::passwords::mysql::research::pass,
+ group => 'researchers',
+ mode => '0440',
+ }
}
node /^snapshot100[1-4]\.eqiad\.wmnet/ {
diff --git a/modules/statistics/manifests/compute.pp
b/modules/statistics/manifests/compute.pp
index 587c73f..bd95d01 100644
--- a/modules/statistics/manifests/compute.pp
+++ b/modules/statistics/manifests/compute.pp
@@ -106,14 +106,6 @@
include passwords::mysql::research
# This file will render at
- # /etc/mysql/conf.d/research-client.cnf.
- mysql::config::client { 'research':
- user => $::passwords::mysql::research::user,
- pass => $::passwords::mysql::research::pass,
- group => 'researchers',
- mode => '0440',
- }
- # This file will render at
# /etc/mysql/conf.d/stats-research-client.cnf.
mysql::config::client { 'stats-research':
user => $::passwords::mysql::research::user,
--
To view, visit https://gerrit.wikimedia.org/r/186502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If47ec117caee8ccdbe7dc6b9185de70818d78f1f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
