Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340102 )
Change subject: role::mediawiki::webserver: adapt to new conftool-data structure
......................................................................
role::mediawiki::webserver: adapt to new conftool-data structure
Change-Id: Iddf2fb5da6b4367ce05efea739a75825e4a1db70
---
M modules/role/manifests/mediawiki/webserver.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/mediawiki/webserver.pp
b/modules/role/manifests/mediawiki/webserver.pp
index c675bdf..2f10fbf 100644
--- a/modules/role/manifests/mediawiki/webserver.pp
+++ b/modules/role/manifests/mediawiki/webserver.pp
@@ -26,8 +26,8 @@
$lvs_service = pick($::lvs::configuration::lvs_services[$pool], {})
$conftool_config = pick($lvs_service['conftool'], {'cluster' =>
'appserver'})
$module_path = get_module_path($module_name)
- $site_nodes =
loadyaml("${module_path}/../../conftool-data/nodes/${::site}.yaml")
- $pool_nodes = keys($site_nodes[$conftool_config['cluster']])
+ $site_nodes =
loadyaml("${module_path}/../../conftool-data/node/${::site}.yaml")
+ $pool_nodes = keys($site_nodes[$::site][$conftool_config['cluster']])
if member($pool_nodes, $::fqdn) {
$times = cron_splay($pool_nodes, 'daily',
'hhvm-conditional-restarts')
cron { 'hhvm-conditional-restart':
--
To view, visit https://gerrit.wikimedia.org/r/340102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iddf2fb5da6b4367ce05efea739a75825e4a1db70
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
