diff --git a/barbican/templates/configmap-etc.yaml b/barbican/templates/configmap-etc.yaml index 6a6ffad676..b7695509af 100644 --- a/barbican/templates/configmap-etc.yaml +++ b/barbican/templates/configmap-etc.yaml @@ -27,6 +27,11 @@ limitations under the License. {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} +# Set a random string as secret key. +{{- if empty .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token.memcache_secret_key -}} +{{- randAlphaNum 64 | set .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token "memcache_secret_key" | quote | trunc 0 -}} +{{- end -}} + {{- if empty .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token.region_name -}} {{- set .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}} {{- end -}} diff --git a/barbican/values.yaml b/barbican/values.yaml index 5471a1fdaa..02bd744d85 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -188,6 +188,7 @@ conf: auth_token: auth_type: password auth_version: v3 + memcache_security_strategy: ENCRYPT database: oslo: db: diff --git a/cinder/templates/configmap-etc.yaml b/cinder/templates/configmap-etc.yaml index 4268d9f079..e91cbcad3e 100644 --- a/cinder/templates/configmap-etc.yaml +++ b/cinder/templates/configmap-etc.yaml @@ -28,6 +28,11 @@ limitations under the License. {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} +# Set a random string as secret key. +{{- if empty .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token.memcache_secret_key -}} +{{- randAlphaNum 64 | set .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token "memcache_secret_key" | quote | trunc 0 -}} +{{- end -}} + {{- if empty .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token.region_name -}} {{- set .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}} {{- end -}} diff --git a/cinder/values.yaml b/cinder/values.yaml index 579eb5be71..1d652d51a5 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -217,6 +217,7 @@ conf: auth_token: auth_version: v3 auth_type: password + memcache_security_strategy: ENCRYPT oslo_concurrency: oslo: concurrency: diff --git a/glance/templates/configmap-etc.yaml b/glance/templates/configmap-etc.yaml index b2aaef8f1a..2d853c00e5 100644 --- a/glance/templates/configmap-etc.yaml +++ b/glance/templates/configmap-etc.yaml @@ -35,6 +35,14 @@ limitations under the License. {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance_registry.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} +# Set a random string as secret key. +{{- if empty .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token.memcache_secret_key -}} +{{- randAlphaNum 64 | set .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token "memcache_secret_key" | quote | trunc 0 -}} +{{- end -}} +{{- if empty .Values.conf.glance_registry.keystone_authtoken.keystonemiddleware.auth_token.memcache_secret_key -}} +{{- randAlphaNum 64 | set .Values.conf.glance_registry.keystone_authtoken.keystonemiddleware.auth_token "memcache_secret_key" | quote | trunc 0 -}} +{{- end -}} + {{- if empty .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token.region_name -}} {{- set .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}} {{- end -}} diff --git a/glance/values.yaml b/glance/values.yaml index e8091b7085..a2449d0f39 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -90,6 +90,7 @@ conf: auth_token: auth_type: password auth_version: v3 + memcache_security_strategy: ENCRYPT glance_store: glance: store: @@ -119,6 +120,7 @@ conf: auth_token: auth_type: password auth_version: v3 + memcache_security_strategy: ENCRYPT paste_deploy: glance: registry: diff --git a/heat/templates/configmap-etc.yaml b/heat/templates/configmap-etc.yaml index 4223045b22..022c25fb91 100644 --- a/heat/templates/configmap-etc.yaml +++ b/heat/templates/configmap-etc.yaml @@ -28,6 +28,10 @@ limitations under the License. {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} +# Set a random string as secret key. +{{- if empty .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token.memcache_secret_key -}} +{{- randAlphaNum 64 | set .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token "memcache_secret_key" | quote | trunc 0 -}} +{{- end -}} {{- if empty .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token.region_name -}} {{- set .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}} {{- end -}} diff --git a/heat/values.yaml b/heat/values.yaml index 2f8304cc1c..bc4addab9f 100644 --- a/heat/values.yaml +++ b/heat/values.yaml @@ -58,6 +58,7 @@ conf: auth_token: auth_type: password auth_version: v3 + memcache_security_strategy: ENCRYPT trustee: heat: common: diff --git a/magnum/templates/configmap-etc.yaml b/magnum/templates/configmap-etc.yaml index fe882ddc29..b6df5f066b 100644 --- a/magnum/templates/configmap-etc.yaml +++ b/magnum/templates/configmap-etc.yaml @@ -28,6 +28,11 @@ limitations under the License. {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} +# Set a random string as secret key. +{{- if empty .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token.memcache_secret_key -}} +{{- randAlphaNum 64 | set .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token "memcache_secret_key" | quote | trunc 0 -}} +{{- end -}} + {{- if empty .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token.region_name -}} {{- set .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}} {{- end -}} diff --git a/magnum/values.yaml b/magnum/values.yaml index 7cc875407a..a13333c73e 100644 --- a/magnum/values.yaml +++ b/magnum/values.yaml @@ -50,6 +50,7 @@ conf: auth_token: auth_type: password auth_version: v3 + memcache_security_strategy: ENCRYPT api: magnum: port: 9511 diff --git a/mistral/templates/configmap-etc.yaml b/mistral/templates/configmap-etc.yaml index 9197994712..05fe0d72f6 100644 --- a/mistral/templates/configmap-etc.yaml +++ b/mistral/templates/configmap-etc.yaml @@ -27,6 +27,11 @@ limitations under the License. {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} +# Set a random string as secret key. +{{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.memcache_secret_key -}} +{{- randAlphaNum 64 | set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "memcache_secret_key" | quote | trunc 0 -}} +{{- end -}} + {{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.region_name -}} {{- set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}} {{- end -}} diff --git a/mistral/values.yaml b/mistral/values.yaml index bae6795e93..ed514067f9 100644 --- a/mistral/values.yaml +++ b/mistral/values.yaml @@ -237,6 +237,7 @@ conf: auth_token: auth_type: password auth_version: v3 + memcache_security_strategy: ENCRYPT pod: affinity: diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml index 6c597d1bfd..6b81df7dff 100644 --- a/neutron/templates/configmap-etc.yaml +++ b/neutron/templates/configmap-etc.yaml @@ -38,6 +38,11 @@ limitations under the License. {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end }} +# Set a random string as secret key. +{{- if empty .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token.memcache_secret_key -}} +{{- randAlphaNum 64 | set .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token "memcache_secret_key" | quote | trunc 0 -}} +{{- end -}} + {{- if empty .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token.project_name -}} {{- set .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token "project_name" .Values.endpoints.identity.auth.user.project_name | quote | trunc 0 -}} {{- end -}} diff --git a/neutron/values.yaml b/neutron/values.yaml index a9fce4fc3d..251f4e2230 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -459,6 +459,7 @@ conf: auth_token: auth_type: password auth_version: v3 + memcache_security_strategy: ENCRYPT ml2_conf: override: append: diff --git a/nova/templates/configmap-etc.yaml b/nova/templates/configmap-etc.yaml index e1e9aab832..46492168e9 100644 --- a/nova/templates/configmap-etc.yaml +++ b/nova/templates/configmap-etc.yaml @@ -28,6 +28,11 @@ limitations under the License. {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} +# Set a random string as secret key. +{{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.memcache_secret_key -}} +{{- randAlphaNum 64 | set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "memcache_secret_key" | quote | trunc 0 -}} +{{- end -}} + {{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.region_name -}} {{- set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}} {{- end -}} diff --git a/nova/values.yaml b/nova/values.yaml index 6944a9b624..f329fdd083 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -371,6 +371,7 @@ conf: auth_token: auth_type: password auth_version: v3 + memcache_security_strategy: ENCRYPT libvirt: nova: diff --git a/senlin/templates/configmap-etc.yaml b/senlin/templates/configmap-etc.yaml index fcefcd384c..73413a0826 100644 --- a/senlin/templates/configmap-etc.yaml +++ b/senlin/templates/configmap-etc.yaml @@ -28,6 +28,11 @@ limitations under the License. {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} +# Set a random string as secret key. +{{- if empty .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token.memcache_secret_key -}} +{{- randAlphaNum 64 | set .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token "memcache_secret_key" | quote | trunc 0 -}} +{{- end -}} + {{- if empty .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token.region_name -}} {{- set .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}} {{- end -}} diff --git a/senlin/values.yaml b/senlin/values.yaml index 44fe92fe56..1208e69a9f 100644 --- a/senlin/values.yaml +++ b/senlin/values.yaml @@ -50,6 +50,7 @@ conf: auth_token: auth_type: password auth_version: v3 + memcache_security_strategy: ENCRYPT senlin_api: senlin: config: