commit 2a1f5a281907b261f6b5b6045672988e9a3fceff
author Oleksandr Bryndzii <obryndzii@mirantis.com> Tue Oct 02 11:50:24 2018 +0000
committer Oleksandr Bryndzii <obryndzii@mirantis.com> Wed Oct 24 01:21:29 2018 +0300
tree 5ed80d1bac12ecb9f80a234977cd4f87d5a823f5
parent f9b98dff1df9a1a12d0d33115618b38570a09a4a

Add glance metadata for memcache security strategy

Change-Id: I7db011e212d1f16296cf10a175bc9e4b8cc2da00
Related-Prod: PROD-22099

glance/control/cluster.yml

diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index da4b9e8..de8e9ae 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -6,6 +6,9 @@
 - system.salt.minion.cert.mysql.clients.openstack.glance
 - system.salt.minion.cert.rabbitmq.clients.openstack.glance
 parameters:
+  _param:
+    glance_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
+    glance_memcache_secret_key: ''
   linux:
     system:
       cron:
@@ -69,6 +72,11 @@
           cert_file: ${_param:rabbitmq_glance_client_ssl_cert_file}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
+      cache:
+        security:
+          enabled: ${_param:glance_memcache_security_enabled}
+          strategy: ${_param:openstack_memcache_security_strategy}
+          secret_key: ${_param:glance_memcache_secret_key}
       storage:
         engine: file
       images: []

glance/control/single.yml

diff --git a/glance/control/single.yml b/glance/control/single.yml
index 34e3e96..ad6e1cb 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -3,6 +3,9 @@
 - system.salt.minion.cert.mysql.clients.openstack.glance
 - system.salt.minion.cert.rabbitmq.clients.openstack.glance
 parameters:
+  _param:
+    glance_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
+    glance_memcache_secret_key: ''
   linux:
     system:
       cron:
@@ -40,3 +43,8 @@
           cert_file: ${_param:rabbitmq_glance_client_ssl_cert_file}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
+      cache:
+        security:
+          enabled: ${_param:glance_memcache_security_enabled}
+          strategy: ${_param:openstack_memcache_security_strategy}
+          secret_key: ${_param:glance_memcache_secret_key}