Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/257509
Change subject: keystone: migrate to redis::instance
......................................................................
keystone: migrate to redis::instance
Change-Id: I015847282f8dd2608b0eafe341980d92cfceebc6
---
M hieradata/hosts/labcontrol1002.yaml
M hieradata/hosts/labcontrol2001.yaml
M modules/role/manifests/labs/openstack/keystone.pp
3 files changed, 23 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/257509/1
diff --git a/hieradata/hosts/labcontrol1002.yaml
b/hieradata/hosts/labcontrol1002.yaml
index 67ea6cf..e187cde 100644
--- a/hieradata/hosts/labcontrol1002.yaml
+++ b/hieradata/hosts/labcontrol1002.yaml
@@ -1,2 +1,3 @@
labs_ldap_dns_host: &labsldapdnshost "labs-ns1.wikimedia.org"
cluster: virt
+keystone_redis_slaveof: labcontrol1001.wikimedia.org
diff --git a/hieradata/hosts/labcontrol2001.yaml
b/hieradata/hosts/labcontrol2001.yaml
index 8a6cd98..896ff8a 100644
--- a/hieradata/hosts/labcontrol2001.yaml
+++ b/hieradata/hosts/labcontrol2001.yaml
@@ -7,3 +7,4 @@
# we're leaving it up for a few days in case
# of misbehaving caches.
labs_ldap_dns_ip_override: 208.80.153.15
+keystone_redis_slaveof: labcontrol1001.wikimedia.org
diff --git a/modules/role/manifests/labs/openstack/keystone.pp
b/modules/role/manifests/labs/openstack/keystone.pp
index 6be59b1..441b915 100644
--- a/modules/role/manifests/labs/openstack/keystone.pp
+++ b/modules/role/manifests/labs/openstack/keystone.pp
@@ -4,21 +4,31 @@
$nova_controller = hiera('labs_nova_controller')
$keystoneconfig = hiera_hash('keystoneconfig', {})
+ $slaveof = hiera('keystone_redis_slaveof', undef)
class { 'openstack::keystone::service':
keystoneconfig => $keystoneconfig,
}
- $replication = {
- 'labcontrol2001' => $nova_controller
- }
-
- class { '::redis::legacy':
- maxmemory => '250mb',
- persist => 'aof',
- redis_replication => $replication,
- password => $keystoneconfig['db_pass'],
- dir => '/var/lib/redis/',
- auto_aof_rewrite_min_size => '64mb',
+ redis::instance { 6379:
+ settings => {
+ appendfilename => "${::hostname}-6379.aof"
+ appendonly => true,
+ client_output_buffer_limit => 'slave 512mb 200mb 60',
+ dbfilename => "${::hostname}-6379.rdb"
+ dir => '/var/lib/redis/',
+ logfile => '/var/log/redis/redis.log',
+ masterauth => $keystoneconfig['db_pass'],
+ maxmemory => '250mb',
+ maxmemory_policy => 'volatile-lru',
+ maxmemory_samples => 5,
+ no_appendfsync_on_rewrite => true,
+ requirepass => $keystoneconfig['db_pass'],
+ save => '""',
+ slave_read_only => false,
+ slaveof => $slaveof,
+ stop_writes_on_bgsave_error => false,
+ auto_aof_rewrite_min_size => '64mb',
+ },
}
}
--
To view, visit https://gerrit.wikimedia.org/r/257509
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I015847282f8dd2608b0eafe341980d92cfceebc6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
