commit 256f63eee6d9538e7d06aa2bcfc70c21e185d6c6
author Oleksandr Bryndzii <obryndzii@mirantis.com> Tue Oct 02 11:36:05 2018 +0000
committer obryndzii <obryndzii@mirantis.com> Wed Oct 24 12:46:39 2018 +0000
tree d70905f7e42d75bc006ad6f3886065439282abf1
parent 7de5fa7a282cb4afa7fe1186ead080dfa26ff76b

Add cinder metadata for memcache security strategy

PROD-22099

Change-Id: I36de03a2a32d94d7995018c1812a0eb841dc68c4

cinder/control/cluster.yml

diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index e34f55c..b56f46f 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -83,4 +83,7 @@
           port: 11211
         - host: ${_param:cluster_node03_address}
           port: 11211
-
+        security:
+          enabled: ${_param:cinder_memcache_security_enabled}
+          strategy: ${_param:openstack_memcache_security_strategy}
+          secret_key: ${_param:cinder_memcache_secret_key}

cinder/control/single.yml

diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index 46bf972..6776835 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -39,4 +39,8 @@
           cert_file: ${_param:rabbitmq_cinder_client_ssl_cert_file}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
-
+      cache:
+        security:
+          enabled: ${_param:cinder_memcache_security_enabled}
+          strategy: ${_param:openstack_memcache_security_strategy}
+          secret_key: ${_param:cinder_memcache_secret_key}

cinder/volume/local.yml

diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index 52f45db..2e7f8de 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -30,3 +30,8 @@
       identity:
         host: ${_param:single_address}
         region: ${_param:openstack_region}
+      cache:
+        security:
+          enabled: ${_param:cinder_memcache_security_enabled}
+          strategy: ${_param:openstack_memcache_security_strategy}
+          secret_key: ${_param:cinder_memcache_secret_key}

cinder/volume/single.yml

diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index 35902b8..c3115e1 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -43,3 +43,8 @@
         host: ${_param:openstack_control_address}
         protocol: ${_param:cluster_internal_protocol}
         region: ${_param:openstack_region}
+      cache:
+        security:
+          enabled: ${_param:cinder_memcache_security_enabled}
+          strategy: ${_param:openstack_memcache_security_strategy}
+          secret_key: ${_param:cinder_memcache_secret_key}