diff --git a/aodh/templates/configmap-etc.yaml b/aodh/templates/configmap-etc.yaml index 3a1cd40d8d..94836a35b4 100644 --- a/aodh/templates/configmap-etc.yaml +++ b/aodh/templates/configmap-etc.yaml @@ -53,10 +53,6 @@ limitations under the License. {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.aodh.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.aodh.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.aodh.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} - {{- if empty .Values.conf.aodh.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "aodh" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.aodh.database "connection" -}} {{- end -}} diff --git a/aodh/values.yaml b/aodh/values.yaml index 8c9e9ee24a..f5879aaa59 100644 --- a/aodh/values.yaml +++ b/aodh/values.yaml @@ -468,7 +468,6 @@ conf: keystone_authtoken: auth_version: v3 auth_type: password - memcache_security_strategy: ENCRYPT service_credentials: auth_type: password interface: internal diff --git a/barbican/templates/configmap-etc.yaml b/barbican/templates/configmap-etc.yaml index 0e640876a5..82a88e10cb 100644 --- a/barbican/templates/configmap-etc.yaml +++ b/barbican/templates/configmap-etc.yaml @@ -47,9 +47,6 @@ limitations under the License. {{- if empty .Values.conf.barbican.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.barbican.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.barbican.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.barbican.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if empty .Values.conf.barbican.DEFAULT.sql_connection -}} {{- $_ := tuple "oslo_db" "internal" "barbican" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.barbican.DEFAULT "sql_connection" -}} diff --git a/barbican/values.yaml b/barbican/values.yaml index aef40919a5..270323659d 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -448,8 +448,6 @@ conf: keystone_authtoken: auth_type: password auth_version: v3 - memcache_security_strategy: ENCRYPT - memcache_secret_key: null database: max_retries: -1 barbican_api: @@ -633,13 +631,6 @@ endpoints: http: default: 15672 oslo_cache: - auth: - # NOTE(portdirect): this is used to define the value for keystone - # authtoken cache encryption key, if not set it will be populated - # automatically with a random value, but to take advantage of - # this feature all services should be set to use the same key, - # and memcache service. - memcache_secret_key: null hosts: default: memcached host_fqdn_override: diff --git a/ceilometer/templates/configmap-etc.yaml b/ceilometer/templates/configmap-etc.yaml index 695908495e..3f3440852a 100644 --- a/ceilometer/templates/configmap-etc.yaml +++ b/ceilometer/templates/configmap-etc.yaml @@ -28,10 +28,6 @@ limitations under the License. {{- if empty .Values.conf.ceilometer.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.ceilometer.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.ceilometer.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} - {{- if empty .Values.conf.ceilometer.cache.memcache_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.ceilometer.cache "memcache_servers" -}} {{- end -}} diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index 486f834611..7113c99632 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -1877,13 +1877,6 @@ endpoints: mongodb: default: 27017 oslo_cache: - auth: - # NOTE(portdirect): this is used to define the value for keystone - # authtoken cache encryption key, if not set it will be populated - # automatically with a random value, but to take advantage of - # this feature all services should be set to use the same key, - # and memcache service. - memcache_secret_key: null hosts: default: memcached host_fqdn_override: diff --git a/cinder/templates/configmap-etc.yaml b/cinder/templates/configmap-etc.yaml index 20862d2858..6f21b5882a 100644 --- a/cinder/templates/configmap-etc.yaml +++ b/cinder/templates/configmap-etc.yaml @@ -47,9 +47,6 @@ limitations under the License. {{- if empty .Values.conf.cinder.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.cinder.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.cinder.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.cinder.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if empty .Values.conf.cinder.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "cinder" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.cinder.database "connection" -}} diff --git a/cinder/values.yaml b/cinder/values.yaml index f3f0d77793..f6d1c93621 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -856,7 +856,6 @@ conf: keystone_authtoken: auth_version: v3 auth_type: password - memcache_security_strategy: ENCRYPT oslo_concurrency: lock_path: "/var/lib/cinder/tmp" oslo_messaging_notifications: @@ -1384,13 +1383,6 @@ endpoints: http: default: 15672 oslo_cache: - auth: - # NOTE(portdirect): this is used to define the value for keystone - # authtoken cache encryption key, if not set it will be populated - # automatically with a random value, but to take advantage of - # this feature all services should be set to use the same key, - # and memcache service. - memcache_secret_key: null hosts: default: memcached host_fqdn_override: diff --git a/congress/templates/configmap-etc.yaml b/congress/templates/configmap-etc.yaml index 4c671beab7..7455273f1f 100644 --- a/congress/templates/configmap-etc.yaml +++ b/congress/templates/configmap-etc.yaml @@ -28,9 +28,6 @@ limitations under the License. {{- if empty .Values.conf.congress.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.congress.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.congress.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.congress.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if empty .Values.conf.congress.keystone_authtoken.auth_url -}} {{- $_ := tuple "identity" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.congress.keystone_authtoken "auth_url" -}} diff --git a/congress/values.yaml b/congress/values.yaml index bec6a509de..4799ec83c7 100644 --- a/congress/values.yaml +++ b/congress/values.yaml @@ -284,13 +284,6 @@ endpoints: mysql: default: 3306 oslo_cache: - auth: - # NOTE(portdirect): this is used to define the value for keystone - # authtoken cache encryption key, if not set it will be populated - # automatically with a random value, but to take advantage of - # this feature all services should be set to use the same key, - # and memcache service. - memcache_secret_key: null hosts: default: memcached host_fqdn_override: diff --git a/designate/templates/configmap-etc.yaml b/designate/templates/configmap-etc.yaml index 8423f59011..9d91b8bd12 100644 --- a/designate/templates/configmap-etc.yaml +++ b/designate/templates/configmap-etc.yaml @@ -51,10 +51,6 @@ {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.designate.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.designate.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.designate.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} - {{- if empty (index .Values.conf.designate "storage:sqlalchemy").connection -}} {{- $_ := tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set (index .Values.conf.designate "storage:sqlalchemy") "connection" -}} {{- $_ := tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.designate.database "connection" -}} diff --git a/designate/values.yaml b/designate/values.yaml index 9a700306fd..b156be2483 100644 --- a/designate/values.yaml +++ b/designate/values.yaml @@ -570,7 +570,6 @@ conf: keystone_authtoken: auth_version: v3 auth_type: password - memcache_security_strategy: ENCRYPT logging: loggers: keys: diff --git a/glance/templates/configmap-etc.yaml b/glance/templates/configmap-etc.yaml index b145afc499..f65b8762a5 100644 --- a/glance/templates/configmap-etc.yaml +++ b/glance/templates/configmap-etc.yaml @@ -75,12 +75,6 @@ limitations under the License. {{- if empty .Values.conf.glance_registry.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.glance_registry.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.glance.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.glance.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} -{{- if empty .Values.conf.glance_registry.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if empty .Values.conf.glance.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "glance" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.glance.database "connection" -}} diff --git a/glance/values.yaml b/glance/values.yaml index 5f98574247..456fc9620c 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -253,7 +253,6 @@ conf: keystone_authtoken: auth_type: password auth_version: v3 - memcache_security_strategy: ENCRYPT glance_store: rbd_store_chunk_size: 8 rbd_store_replication: 3 @@ -382,7 +381,6 @@ conf: keystone_authtoken: auth_type: password auth_version: v3 - memcache_security_strategy: ENCRYPT paste_deploy: flavor: keystone database: @@ -683,13 +681,6 @@ endpoints: mysql: default: 3306 oslo_cache: - auth: - # NOTE(portdirect): this is used to define the value for keystone - # authtoken cache encryption key, if not set it will be populated - # automatically with a random value, but to take advantage of - # this feature all services should be set to use the same key, - # and memcache service. - memcache_secret_key: null hosts: default: memcached host_fqdn_override: diff --git a/heat/templates/configmap-etc.yaml b/heat/templates/configmap-etc.yaml index 115ea9ae28..5266665e21 100644 --- a/heat/templates/configmap-etc.yaml +++ b/heat/templates/configmap-etc.yaml @@ -70,9 +70,6 @@ limitations under the License. {{- if empty .Values.conf.heat.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.heat.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.heat.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.heat.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if empty .Values.conf.heat.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "heat" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.heat.database "connection" -}} diff --git a/heat/values.yaml b/heat/values.yaml index 282c17a9f7..13189c960b 100644 --- a/heat/values.yaml +++ b/heat/values.yaml @@ -439,7 +439,6 @@ conf: keystone_authtoken: auth_type: password auth_version: v3 - memcache_security_strategy: ENCRYPT database: max_retries: -1 trustee: @@ -951,13 +950,6 @@ endpoints: mysql: default: 3306 oslo_cache: - auth: - # NOTE(portdirect): this is used to define the value for keystone - # authtoken cache encryption key, if not set it will be populated - # automatically with a random value, but to take advantage of - # this feature all services should be set to use the same key, - # and memcache service. - memcache_secret_key: null hosts: default: memcached host_fqdn_override: diff --git a/ironic/templates/configmap-etc.yaml b/ironic/templates/configmap-etc.yaml index c7268c4edf..7781d7cd66 100644 --- a/ironic/templates/configmap-etc.yaml +++ b/ironic/templates/configmap-etc.yaml @@ -45,9 +45,6 @@ limitations under the License. {{- if empty .Values.conf.ironic.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.ironic.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.ironic.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.ironic.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if empty .Values.conf.ironic.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "ironic" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ironic.database "connection" -}} diff --git a/ironic/values.yaml b/ironic/values.yaml index 5946474ad0..d1617316f5 100644 --- a/ironic/values.yaml +++ b/ironic/values.yaml @@ -457,13 +457,6 @@ endpoints: mysql: default: 3306 oslo_cache: - auth: - # NOTE(portdirect): this is used to define the value for keystone - # authtoken cache encryption key, if not set it will be populated - # automatically with a random value, but to take advantage of - # this feature all services should be set to use the same key, - # and memcache service. - memcache_secret_key: null hosts: default: memcached host_fqdn_override: diff --git a/magnum/templates/configmap-etc.yaml b/magnum/templates/configmap-etc.yaml index ead495fe06..cb41e77ce9 100644 --- a/magnum/templates/configmap-etc.yaml +++ b/magnum/templates/configmap-etc.yaml @@ -47,9 +47,6 @@ limitations under the License. {{- if empty .Values.conf.magnum.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.magnum.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.magnum.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.magnum.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if empty .Values.conf.magnum.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "magnum" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.magnum.database "connection" -}} diff --git a/magnum/values.yaml b/magnum/values.yaml index 3dc1f47437..1204f16661 100644 --- a/magnum/values.yaml +++ b/magnum/values.yaml @@ -129,7 +129,6 @@ conf: keystone_authtoken: auth_type: password auth_version: v3 - memcache_security_strategy: ENCRYPT api: # NOTE(portdirect): the bind port should not be defined, and is manipulated # via the endpoints section. @@ -429,13 +428,6 @@ endpoints: mysql: default: 3306 oslo_cache: - auth: - # NOTE(portdirect): this is used to define the value for keystone - # authtoken cache encryption key, if not set it will be populated - # automatically with a random value, but to take advantage of - # this feature all services should be set to use the same key, - # and memcache service. - memcache_secret_key: null hosts: default: memcached host_fqdn_override: diff --git a/mistral/templates/configmap-etc.yaml b/mistral/templates/configmap-etc.yaml index bd085aef24..26890764d4 100644 --- a/mistral/templates/configmap-etc.yaml +++ b/mistral/templates/configmap-etc.yaml @@ -47,9 +47,6 @@ limitations under the License. {{- if empty .Values.conf.mistral.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.mistral.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.mistral.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.mistral.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if empty .Values.conf.mistral.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "mistral" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.mistral.database "connection" -}} diff --git a/mistral/values.yaml b/mistral/values.yaml index e0682eb11d..d74411bdf2 100644 --- a/mistral/values.yaml +++ b/mistral/values.yaml @@ -303,13 +303,6 @@ endpoints: http: default: 15672 oslo_cache: - auth: - # NOTE(portdirect): this is used to define the value for keystone - # authtoken cache encryption key, if not set it will be populated - # automatically with a random value, but to take advantage of - # this feature all services should be set to use the same key, - # and memcache service. - memcache_secret_key: null hosts: default: memcached host_fqdn_override: @@ -468,7 +461,6 @@ conf: keystone_authtoken: auth_type: password auth_version: v3 - memcache_security_strategy: ENCRYPT logging: loggers: keys: diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml index f08105e10e..7eb3b1907a 100644 --- a/neutron/templates/configmap-etc.yaml +++ b/neutron/templates/configmap-etc.yaml @@ -49,9 +49,6 @@ limitations under the License. {{- if empty $envAll.Values.conf.neutron.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set $envAll.Values.conf.neutron.keystone_authtoken "memcached_servers" -}} {{- end }} -{{- if empty .Values.conf.neutron.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.neutron.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if empty $envAll.Values.conf.neutron.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "neutron" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set $envAll.Values.conf.neutron.database "connection" -}} diff --git a/neutron/values.yaml b/neutron/values.yaml index f132b44376..916b4e8802 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -1813,7 +1813,6 @@ conf: ironic: endpoint_type: internal keystone_authtoken: - memcache_security_strategy: ENCRYPT auth_type: password auth_version: v3 octavia: @@ -2136,13 +2135,6 @@ endpoints: http: default: 15672 oslo_cache: - auth: - # NOTE(portdirect): this is used to define the value for keystone - # authtoken cache encryption key, if not set it will be populated - # automatically with a random value, but to take advantage of - # this feature all services should be set to use the same key, - # and memcache service. - memcache_secret_key: null hosts: default: memcached host_fqdn_override: diff --git a/nova/templates/configmap-etc.yaml b/nova/templates/configmap-etc.yaml index 6ed6f1c67f..b93fb8241e 100644 --- a/nova/templates/configmap-etc.yaml +++ b/nova/templates/configmap-etc.yaml @@ -48,9 +48,6 @@ limitations under the License. {{- if empty .Values.conf.nova.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.nova.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.nova.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if .Values.conf.nova.service_user.send_service_user_token -}} @@ -214,10 +211,6 @@ limitations under the License. {{- $_ := set .Values.conf.nova.ironic "auth_version" .Values.endpoints.identity.auth.ironic.auth_version -}} {{- end -}} -{{- if empty .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 -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.ironic "memcache_servers" -}} {{- end -}} diff --git a/nova/values.yaml b/nova/values.yaml index e65b7cb9a4..0e5c83c9d9 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -1727,7 +1727,6 @@ conf: keystone_authtoken: auth_type: password auth_version: v3 - memcache_security_strategy: ENCRYPT service_user: auth_type: password send_service_user_token: false @@ -1950,13 +1949,6 @@ endpoints: http: default: 15672 oslo_cache: - auth: - # NOTE(portdirect): this is used to define the value for keystone - # authtoken cache encryption key, if not set it will be populated - # automatically with a random value, but to take advantage of - # this feature all services should be set to use the same key, - # and memcache service. - memcache_secret_key: null hosts: default: memcached host_fqdn_override: diff --git a/octavia/templates/configmap-etc.yaml b/octavia/templates/configmap-etc.yaml index e8d166c6ff..a0d8d30d0d 100644 --- a/octavia/templates/configmap-etc.yaml +++ b/octavia/templates/configmap-etc.yaml @@ -49,9 +49,6 @@ limitations under the License. {{- if empty .Values.conf.octavia.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.octavia.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.octavia.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.octavia.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if empty .Values.conf.octavia.service_auth.auth_url -}} {{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.octavia.service_auth "auth_url" -}} @@ -76,9 +73,6 @@ limitations under the License. {{- if empty .Values.conf.octavia.service_auth.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.octavia.service_auth "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.octavia.service_auth.memcache_secret_key -}} -{{- $_ := set .Values.conf.octavia.service_auth "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if empty .Values.conf.octavia.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "octavia" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.octavia.database "connection" -}} diff --git a/octavia/values.yaml b/octavia/values.yaml index e879792543..1701fed892 100644 --- a/octavia/values.yaml +++ b/octavia/values.yaml @@ -220,7 +220,6 @@ conf: keystone_authtoken: auth_type: password auth_version: v3 - memcache_security_strategy: ENCRYPT certificates: ca_private_key_passphrase: foobar ca_private_key: /etc/octavia/certs/private/cakey.pem @@ -260,7 +259,6 @@ conf: auth_type: password cafile: "" auth_version: v3 - memcache_security_strategy: ENCRYPT logging: loggers: keys: diff --git a/panko/templates/configmap-etc.yaml b/panko/templates/configmap-etc.yaml index b00e7b6ce4..57803a6a52 100644 --- a/panko/templates/configmap-etc.yaml +++ b/panko/templates/configmap-etc.yaml @@ -53,10 +53,6 @@ limitations under the License. {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.panko.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.panko.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.panko.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} - {{- if empty .Values.conf.panko.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "panko" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.panko.database "connection" -}} {{- end -}} diff --git a/panko/values.yaml b/panko/values.yaml index 75dba8d62a..1b3893fe69 100644 --- a/panko/values.yaml +++ b/panko/values.yaml @@ -258,7 +258,6 @@ conf: keystone_authtoken: auth_version: v3 auth_type: password - memcache_security_strategy: ENCRYPT logging: loggers: keys: diff --git a/rally/templates/configmap-etc.yaml b/rally/templates/configmap-etc.yaml index 2bbe5fec72..03b8d3ff44 100644 --- a/rally/templates/configmap-etc.yaml +++ b/rally/templates/configmap-etc.yaml @@ -44,9 +44,6 @@ limitations under the License. {{- if empty .Values.conf.rally.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.rally.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.rally.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.rally.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if empty .Values.conf.rally.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "rally" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.rally.database "connection" -}} diff --git a/rally/values.yaml b/rally/values.yaml index 178bd7f566..d89e366ebd 100644 --- a/rally/values.yaml +++ b/rally/values.yaml @@ -280,9 +280,6 @@ endpoints: mysql: default: 3306 oslo_cache: - auth: - keystone_authtoken: - secret_key: null hosts: default: memcached host_fqdn_override: diff --git a/senlin/templates/configmap-etc.yaml b/senlin/templates/configmap-etc.yaml index da78fbc64e..15772d8db0 100644 --- a/senlin/templates/configmap-etc.yaml +++ b/senlin/templates/configmap-etc.yaml @@ -48,9 +48,6 @@ limitations under the License. {{- if empty .Values.conf.senlin.keystone_authtoken.memcached_servers -}} {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.senlin.keystone_authtoken "memcached_servers" -}} {{- end -}} -{{- if empty .Values.conf.senlin.keystone_authtoken.memcache_secret_key -}} -{{- $_ := set .Values.conf.senlin.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} -{{- end -}} {{- if empty .Values.conf.senlin.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "senlin" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.senlin.database "connection" -}} diff --git a/senlin/values.yaml b/senlin/values.yaml index c3d466163d..1516e95e18 100644 --- a/senlin/values.yaml +++ b/senlin/values.yaml @@ -175,7 +175,6 @@ conf: keystone_authtoken: auth_type: password auth_version: v3 - memcache_security_strategy: ENCRYPT senlin_api: # NOTE(portdirect): the bind port should not be defined, and is manipulated # via the endpoints section. @@ -448,13 +447,6 @@ endpoints: mysql: default: 3306 oslo_cache: - auth: - # NOTE(portdirect): this is used to define the value for keystone - # authtoken cache encryption key, if not set it will be populated - # automatically with a random value, but to take advantage of - # this feature all services should be set to use the same key, - # and memcache service. - memcache_secret_key: null hosts: default: memcached host_fqdn_override: