Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371021 )
Change subject: role::mediawiki::memcached: switch to the future parser
..
role::mediawiki::memcached: switch to the future parser
Change-Id: Ib1e5b23ff706ff2af76bfa08d116c2cfff9c2752
---
M hieradata/role/common/mediawiki/memcached.yaml
M modules/profile/templates/jobqueue_redis/statefile.tpl.erb
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/mediawiki/memcached.yaml
b/hieradata/role/common/mediawiki/memcached.yaml
index 70221d7..0a9c936 100644
--- a/hieradata/role/common/mediawiki/memcached.yaml
+++ b/hieradata/role/common/mediawiki/memcached.yaml
@@ -22,3 +22,4 @@
profile::memcached::extended_options:
- 'slab_reassign'
profile::memcached::port: '11211'
+profile::base::environment: "future"
diff --git a/modules/profile/templates/jobqueue_redis/statefile.tpl.erb
b/modules/profile/templates/jobqueue_redis/statefile.tpl.erb
index 808d550..90d5285 100644
--- a/modules/profile/templates/jobqueue_redis/statefile.tpl.erb
+++ b/modules/profile/templates/jobqueue_redis/statefile.tpl.erb
@@ -12,7 +12,7 @@
shard = name
end
end
-if shards[site][shard]['replica'] != false
+if @shards[site][shard]['replica'] != false
-%>
{{ $site := json ( getv "/<%= site %>" ) }}{{ if $site.pooled }}
# This redis server is a global master as it's in an active datacenter
--
To view, visit https://gerrit.wikimedia.org/r/371021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1e5b23ff706ff2af76bfa08d116c2cfff9c2752
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
