From 8ae990e6224ca21f4ff48d12bacc521499e956d9 Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Wed, 26 Sep 2018 03:29:23 +0000
Subject: [PATCH] [nova] Allow deterministic setting of
 'ironic.memcache_secret_key

If conf.nova.ironic.memcache_secret_key is not explicitly set, derive
it from endpoints.oslo_cache.auth.memcache_secret_key or use a random
value.

This means when installing charts where we explicitly set
endpoints.oslo_cache.auth.memcache_secret_key upgrades without changes
won't churn.

Change-Id: I686297e25627d88ff9bd32df0a3f7ee8afc11f58
---
 nova/templates/configmap-etc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/templates/configmap-etc.yaml b/nova/templates/configmap-etc.yaml
index d1a55f5c80..55aa31142b 100644
--- a/nova/templates/configmap-etc.yaml
+++ b/nova/templates/configmap-etc.yaml
@@ -189,7 +189,7 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.nova.ironic.memcache_secret_key -}}
-{{- $_ := randAlphaNum 64 | set .Values.conf.nova.ironic "memcache_secret_key" -}}
+{{- $_ := (default (randAlphaNum 64) .Values.endpoints.oslo_cache.auth.memcache_secret_key) | set .Values.conf.nova.ironic "memcache_secret_key" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.nova.ironic.memcache_servers -}}