Merge pull request #345 from stuggi/cache_backend

Use tls for cache if supported
openstack-k8s-operators · Apr 29, 2024 · c0cf53c · c0cf53c
2 parents b993362 + 4ff76d7
commit c0cf53c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/controllers/neutronapi_controller.go b/controllers/neutronapi_controller.go
@@ -1487,6 +1487,7 @@ func (r *NeutronAPIReconciler) generateServiceSecrets(
 	templateParameters["TransportURL"] = transportURL
 	templateParameters["MemcachedServers"] = mc.GetMemcachedServerListString()
 	templateParameters["MemcachedServersWithInet"] = mc.GetMemcachedServerListWithInetString()
+	templateParameters["MemcachedTLS"] = mc.GetMemcachedTLSSupport()
 
 	// Other OpenStack services
 	servicePassword := string(ospSecret.Data[instance.Spec.PasswordSelectors.Service])

diff --git a/templates/neutronapi/config/01-neutron.conf b/templates/neutronapi/config/01-neutron.conf
@@ -89,9 +89,14 @@ password = {{ .ServicePassword }}
 lock_path = /var/lib/neutron/tmp
 
 [cache]
-backend=dogpile.cache.pymemcache
+{{if .MemcachedTLS}}
+backend = dogpile.cache.pymemcache
+{{else}}
+backend = dogpile.cache.memcached
+{{end}}
 enabled=true
 memcache_servers={{ .MemcachedServers }}
+tls_enabled={{ .MemcachedTLS }}
 
 [oslo_policy]
 enforce_scope = True