commit dc8a469cfa07dabb30f09673a0f83fe5f0c126a5
author Vasyl Saienko <vsaienko@mirantis.com> Tue May 21 12:38:34 2019 +0000
committer Gerrit Code Review <mail@domain.com> Tue May 21 12:38:34 2019 +0000
tree c4442d80bee0b20b04449eecb6c1d0fe4e56fe93
parent 9efa6b473c97280a9408e62e4662f19e8ab34cc9
parent 7c1d3b390ae2257d479778780681fbef264c4b9d

Merge "Add redis metadata for ceilometer" into release/proposed/2019.2.0

ceilometer/server/coordination/redis.yml

diff --git a/ceilometer/server/coordination/redis.yml b/ceilometer/server/coordination/redis.yml
index 46e78ec..7b0edac 100644
--- a/ceilometer/server/coordination/redis.yml
+++ b/ceilometer/server/coordination/redis.yml
@@ -7,3 +7,14 @@
     server:
       coordination_backend:
         url: ${_param:ceilometer_coordination_url}
+        engine: redis
+        redis:
+          password: ${_param:openstack_telemetry_redis_password}
+          user: openstack
+          db: ${_param:ceilometer_redis_db}
+          sentinel:
+            host: ${_param:redis_sentinel_node01_address}
+            master_name: ${_param:ceilometer_redis_sentinel_mastername}
+            fallback:
+              - host: ${_param:redis_sentinel_node02_address}
+              - host: ${_param:redis_sentinel_node03_address}

defaults/openstack/init.yml

diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 39ebbce..8d41c37 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -80,6 +80,8 @@
     ceilometer_old_version: ${_param:openstack_old_version}
     ceilometer_version: ${_param:openstack_version}
     ceilometer_upgrade_enabled: ${_param:openstack_upgrade_enabled}
+    ceilometer_redis_db: ${_param:openstack_telemetry_redis_db}
+    ceilometer_redis_sentinel_mastername: ${_param:openstack_telemetry_redis_sentinel_mastername}
     # Gnocchi
     gnocchi_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     gnocchi_memcache_secret_key: ''