Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/120518
Change subject: mha: fix var scope search
......................................................................
mha: fix var scope search
Change-Id: I20a58df4c1bcc871da9e9b92078e58419ab77ac8
---
M templates/mha/local.erb
M templates/mha/siteswitch.erb
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/120518/1
diff --git a/templates/mha/local.erb b/templates/mha/local.erb
index a2f82bd..911de30 100644
--- a/templates/mha/local.erb
+++ b/templates/mha/local.erb
@@ -2,7 +2,7 @@
user=root
password=<%= mysql_root_pass %>
repl_user=repl
-repl_password=<%= mysql_repl_pass %>
+repl_password=<%= scope.lookupvar('mha::manager inherits
role::coredb::config::mysql_repl_pass') %>
ssh_user=mysql
ssh_options="-i /home/mysql/.ssh/mysql.key"
remote_workdir=/a/tmp
diff --git a/templates/mha/siteswitch.erb b/templates/mha/siteswitch.erb
index 90f5cb4..65dabfa 100644
--- a/templates/mha/siteswitch.erb
+++ b/templates/mha/siteswitch.erb
@@ -2,7 +2,7 @@
user=root
password=<%= mysql_root_pass %>
repl_user=repl
-repl_password=<%= mysql_repl_pass %>
+repl_password=<%= scope.lookupvar('mha::manager inherits
role::coredb::config::mysql_repl_pass') %>
ssh_user=mysql
ssh_options="-i /home/mysql/.ssh/mysql.key"
remote_workdir=/a/tmp
--
To view, visit https://gerrit.wikimedia.org/r/120518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I20a58df4c1bcc871da9e9b92078e58419ab77ac8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
