Ori.livneh has submitted this change and it was merged.
Change subject: migrate mc* to redis::instance
......................................................................
migrate mc* to redis::instance
Change-Id: I0f55f283644fa42c75b41a218ea68787228a7d37
---
M hieradata/role/codfw/memcached.yaml
M hieradata/role/common/memcached.yaml
M manifests/role/memcached.pp
M manifests/site.pp
4 files changed, 20 insertions(+), 17 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/codfw/memcached.yaml
b/hieradata/role/codfw/memcached.yaml
index e6b6f16..3434cac 100644
--- a/hieradata/role/codfw/memcached.yaml
+++ b/hieradata/role/codfw/memcached.yaml
@@ -1,4 +1,3 @@
-redis::legacy::dir: "/srv/redis"
debdeploy::grains:
debdeploy-memcached-codfw:
value: standard
diff --git a/hieradata/role/common/memcached.yaml
b/hieradata/role/common/memcached.yaml
index 0eeb9f7..d90a586 100644
--- a/hieradata/role/common/memcached.yaml
+++ b/hieradata/role/common/memcached.yaml
@@ -1,6 +1,3 @@
cluster: memcached
-redis::legacy::maxmemory: "500Mb"
-redis::legacy::dir: "/srv/redis"
-redis::legacy::password: "%{passwords::redis::main_password}"
admin::groups:
- perf-roots
diff --git a/manifests/role/memcached.pp b/manifests/role/memcached.pp
index c96a993..fb6d509 100644
--- a/manifests/role/memcached.pp
+++ b/manifests/role/memcached.pp
@@ -5,6 +5,7 @@
include standard
include base::mysterious_sysctl
include base::firewall
+ include passwords::redis
$memcached_size = $::realm ? {
'production' => 89088,
@@ -70,12 +71,29 @@
minute => fqdn_rand(59, 'memkeys'),
}
- ferm::service {'redis_memcached_role':
+ redis::instance { 6379:
+ settings => {
+ auto_aof_rewrite_min_size => '512mb',
+ client_output_buffer_limit => 'slave 512mb 200mb 60',
+ dir => '/srv/redis',
+ masterauth => $passwords::redis::main_password,
+ maxmemory => '500Mb',
+ maxmemory_policy => 'volatile-lru',
+ maxmemory_samples => 5,
+ no_appendfsync_on_rewrite => true,
+ requirepass => $passwords::redis::main_password,
+ save => '300 100',
+ slave_read_only => false,
+ stop_writes_on_bgsave_error => false,
+ },
+ }
+
+ ferm::service { 'redis_memcached_role':
proto => 'tcp',
port => '6379',
}
- ferm::service {'memcached_memcached_role':
+ ferm::service { 'memcached_memcached_role':
proto => 'tcp',
port => '11211',
}
diff --git a/manifests/site.pp b/manifests/site.pp
index ddc39d4..4853ebf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1742,22 +1742,11 @@
}
node /^mc(10[01][0-9])\.eqiad\.wmnet/ {
-
role memcached
- include passwords::redis
-
- file { '/a':
- ensure => 'directory',
- }
-
- include redis::legacy
}
node /^mc20[01][0-9]\.codfw\.wmnet/ {
role memcached
- include passwords::redis
- include redis::legacy
-
}
# OTRS evaluation upgrade
--
To view, visit https://gerrit.wikimedia.org/r/257417
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f55f283644fa42c75b41a218ea68787228a7d37
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
