Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344480 )
Change subject: role::memcached: convert to use profile::multidc::redis
......................................................................
role::memcached: convert to use profile::multidc::redis
Change-Id: I8868d4c597e275003fe1425abc98e7b344a37422
---
M hieradata/role/common/memcached.yaml
M modules/role/manifests/memcached.pp
2 files changed, 18 insertions(+), 58 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/memcached.yaml
b/hieradata/role/common/memcached.yaml
index d90a586..13d7452 100644
--- a/hieradata/role/common/memcached.yaml
+++ b/hieradata/role/common/memcached.yaml
@@ -1,3 +1,18 @@
cluster: memcached
admin::groups:
- perf-roots
+profile::redis::multidc::category: sessions
+profile::redis::multidc::discovery: "appservers-rw"
+profile::redis::multidc::settings:
+ bind: '0.0.0.0'
+ auto_aof_rewrite_min_size: '512mb'
+ client_output_buffer_limit: 'slave 512mb 200mb 60'
+ dir: '/srv/redis'
+ maxmemory: '500Mb'
+ maxmemory_policy: 'volatile-lru'
+ maxmemory_samples: 5
+ no_appendfsync_on_rewrite: true
+ save: '300 100'
+ slave_read_only: false
+ stop_writes_on_bgsave_error: false
+profile::redis::multidc::aof: false
diff --git a/modules/role/manifests/memcached.pp
b/modules/role/manifests/memcached.pp
index dfaab0b..926525c 100644
--- a/modules/role/manifests/memcached.pp
+++ b/modules/role/manifests/memcached.pp
@@ -82,64 +82,6 @@
minute => fqdn_rand(59, 'memkeys'),
}
-
- $base_settings = {
- bind => '0.0.0.0',
- auto_aof_rewrite_min_size => '512mb',
- client_output_buffer_limit => 'slave 512mb 200mb 60',
- dir => '/srv/redis',
- dbfilename => "${::hostname}-6379.rdb",
- 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,
- }
-
- $shards = {
- 'eqiad' => hiera('mediawiki::redis_servers::eqiad'),
- 'codfw' => hiera('mediawiki::redis_servers::codfw')
- }
-
- if os_version('Debian >= jessie') {
- class { 'redis::multidc::ipsec':
- shards => $shards
- }
- }
-
- class { 'redis::multidc::instances':
- shards => $shards,
- settings => $base_settings,
- map => {
- '6380' => {
- dbfilename => "${::hostname}-6380.rdb",
- }
- }
- }
-
-
- # Monitoring
-
- # Declare monitoring for all redis instances
- redis::monitoring::instance { $::redis::multidc::instances::instances:
- settings => $base_settings,
- map => $::redis::multidc::instances::replica_map,
- }
-
- # Firewall rules
- include ::ferm::ipsec_allow
-
- $redis_ports = join($::redis::multidc::instances::instances, ' ')
-
- ferm::service { 'redis_memcached_role':
- proto => 'tcp',
- port => inline_template('(<%= @redis_ports %>)'),
- }
-
ferm::service { 'memcached_memcached_role':
proto => 'tcp',
port => '11211',
@@ -149,4 +91,7 @@
content => template('role/memcached/rsyslog.conf.erb'),
priority => 40,
}
+
+ # Include redis for sessions
+ include profile::redis::multidc
}
--
To view, visit https://gerrit.wikimedia.org/r/344480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8868d4c597e275003fe1425abc98e7b344a37422
Gerrit-PatchSet: 2
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
