commit eb3e47d46d23ede294a83c5f3b7773db679ccf1f
author Martin Polreich <mpolreich@mirantis.com> Mon Nov 05 14:29:53 2018 +0000
committer Gerrit Code Review <mail@domain.com> Mon Nov 05 14:29:53 2018 +0000
tree bc4bef9065487302e738557454799720ebafb608
parent 0b5809e06962d9d3ad5d1cb240de5204d449a7c7
parent 8b77bf65c8dd2f04a44a45d8e2360d17c9a0630b

Merge "Refactor OC4 cluster for K8s"

defaults/openstack/init.yml

diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 468778a..ab31e8d 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -24,3 +24,6 @@
     # Aodh
     aodh_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     aodh_memcache_secret_key: ''
+    # Gnocchi
+    gnocchi_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
+    gnocchi_memcache_secret_key: ''

gnocchi/server/cluster.yml

diff --git a/gnocchi/server/cluster.yml b/gnocchi/server/cluster.yml
index 7de3ede..1ad5e44 100644
--- a/gnocchi/server/cluster.yml
+++ b/gnocchi/server/cluster.yml
@@ -29,3 +29,7 @@
           port: 11211
         - host: ${_param:gnocchi_memcached_node03_address}
           port: 11211
+        security:
+          enabled: ${_param:gnocchi_memcache_security_enabled}
+          strategy: ${_param:openstack_memcache_security_strategy}
+          secret_key: ${_param:gnocchi_memcache_secret_key}

gnocchi/server/single.yml

diff --git a/gnocchi/server/single.yml b/gnocchi/server/single.yml
index c4e1547..43a2c9d 100644
--- a/gnocchi/server/single.yml
+++ b/gnocchi/server/single.yml
@@ -10,3 +10,8 @@
       metricd:
         metric_processing_delay: 15
         metric_reporting_delay: 30
+      cache:
+        security:
+          enabled: ${_param:gnocchi_memcache_security_enabled}
+          strategy: ${_param:openstack_memcache_security_strategy}
+          secret_key: ${_param:gnocchi_memcache_secret_key}