Use dogpile.cache.pymemcache for memcached tls

openstack-k8s-operators · Apr 29, 2024 · 3d1ebf9 · 3d1ebf9
1 parent 3f7a00e
commit 3d1ebf9
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 1 deletion.
diff --git a/templates/nova.conf b/templates/nova.conf
@@ -165,7 +165,11 @@ enabled = False
 enabled = True
 {{if (index . "MemcachedServers")}}
 # on contoler we prefer to use memcache when its deployed
-backend = oslo_cache.memcache_pool
+{{if .MemcachedTLS}}
+backend = dogpile.cache.pymemcache
+{{else}}
+backend = dogpile.cache.memcached
+{{end}}
 memcache_servers={{ .MemcachedServers }}
 tls_enabled={{ .MemcachedTLS }}
 {{else}}

diff --git a/test/functional/nova_metadata_controller_test.go b/test/functional/nova_metadata_controller_test.go
@@ -217,6 +217,8 @@ var _ = Describe("NovaMetadata controller", func() {
 
 				Expect(configData).Should(
 					ContainSubstring("[upgrade_levels]\ncompute = auto"))
+				Expect(configData).Should(
+					ContainSubstring("backend = dogpile.cache.memcached"))
 				Expect(configData).Should(
 					ContainSubstring(fmt.Sprintf("memcache_servers=memcached-0.memcached.%s.svc:11211,memcached-1.memcached.%s.svc:11211,memcached-2.memcached.%s.svc:11211",
 						novaNames.Namespace, novaNames.Namespace, novaNames.Namespace)))
@@ -980,6 +982,8 @@ var _ = Describe("NovaMetadata controller", func() {
 			Expect(configData).Should(ContainSubstring("SSLCertificateKeyFile   \"/etc/pki/tls/private/nova-metadata.key\""))
 
 			configData = string(configDataMap.Data["01-nova.conf"])
+			Expect(configData).Should(
+				ContainSubstring("backend = dogpile.cache.pymemcache"))
 			Expect(configData).Should(
 				ContainSubstring(fmt.Sprintf("memcache_servers=memcached-0.memcached.%s.svc:11211,memcached-1.memcached.%s.svc:11211,memcached-2.memcached.%s.svc:11211",
 					novaNames.Namespace, novaNames.Namespace, novaNames.Namespace)))

diff --git a/test/functional/nova_novncproxy_test.go b/test/functional/nova_novncproxy_test.go
@@ -195,6 +195,8 @@ var _ = Describe("NovaNoVNCProxy controller", func() {
 				Expect(configData).Should(ContainSubstring("novncproxy_host = \"::0\""))
 				Expect(configData).Should(ContainSubstring("novncproxy_port = 6080"))
 				Expect(configData).Should(ContainSubstring("password = service-password"))
+				Expect(configData).Should(
+					ContainSubstring("backend = dogpile.cache.memcached"))
 				Expect(configData).Should(
 					ContainSubstring(fmt.Sprintf("memcache_servers=memcached-0.memcached.%s.svc:11211,memcached-1.memcached.%s.svc:11211,memcached-2.memcached.%s.svc:11211",
 						novaNames.Namespace, novaNames.Namespace, novaNames.Namespace)))
@@ -873,6 +875,8 @@ var _ = Describe("NovaNoVNCProxy controller", func() {
 			Expect(configData).Should(Not(ContainSubstring("vencrypt_ca_certs=/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem")))
 
 			configData = string(configDataMap.Data["01-nova.conf"])
+			Expect(configData).Should(
+				ContainSubstring("backend = dogpile.cache.pymemcache"))
 			Expect(configData).Should(
 				ContainSubstring(fmt.Sprintf("memcache_servers=memcached-0.memcached.%s.svc:11211,memcached-1.memcached.%s.svc:11211,memcached-2.memcached.%s.svc:11211",
 					novaNames.Namespace, novaNames.Namespace, novaNames.Namespace)))
@@ -1036,6 +1040,8 @@ var _ = Describe("NovaNoVNCProxy controller", func() {
 			Expect(configData).Should(ContainSubstring("vencrypt_ca_certs=/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"))
 
 			configData = string(configDataMap.Data["01-nova.conf"])
+			Expect(configData).Should(
+				ContainSubstring("backend = dogpile.cache.pymemcache"))
 			Expect(configData).Should(
 				ContainSubstring(fmt.Sprintf("memcache_servers=memcached-0.memcached.%s.svc:11211,memcached-1.memcached.%s.svc:11211,memcached-2.memcached.%s.svc:11211",
 					novaNames.Namespace, novaNames.Namespace, novaNames.Namespace)))
@@ -1226,6 +1232,8 @@ var _ = Describe("NovaNoVNCProxy controller", func() {
 			Expect(configData).Should(ContainSubstring("vencrypt_ca_certs=/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"))
 
 			configData = string(configDataMap.Data["01-nova.conf"])
+			Expect(configData).Should(
+				ContainSubstring("backend = dogpile.cache.pymemcache"))
 			Expect(configData).Should(
 				ContainSubstring(fmt.Sprintf("memcache_servers=memcached-0.memcached.%s.svc:11211,memcached-1.memcached.%s.svc:11211,memcached-2.memcached.%s.svc:11211",
 					novaNames.Namespace, novaNames.Namespace, novaNames.Namespace)))

diff --git a/test/functional/nova_scheduler_test.go b/test/functional/nova_scheduler_test.go
@@ -228,6 +228,8 @@ var _ = Describe("NovaScheduler controller", func() {
 			configData := string(configDataMap.Data["01-nova.conf"])
 			Expect(configData).To(ContainSubstring("transport_url=rabbit://api/fake"))
 			Expect(configData).To(ContainSubstring("password = service-password"))
+			Expect(configData).Should(
+				ContainSubstring("backend = dogpile.cache.memcached"))
 			Expect(configData).Should(
 				ContainSubstring(fmt.Sprintf("memcache_servers=memcached-0.memcached.%s.svc:11211,memcached-1.memcached.%s.svc:11211,memcached-2.memcached.%s.svc:11211",
 					novaNames.Namespace, novaNames.Namespace, novaNames.Namespace)))
@@ -785,6 +787,8 @@ var _ = Describe("NovaScheduler controller", func() {
 			Expect(configDataMap).ShouldNot(BeNil())
 
 			configData := string(configDataMap.Data["01-nova.conf"])
+			Expect(configData).Should(
+				ContainSubstring("backend = dogpile.cache.pymemcache"))
 			Expect(configData).Should(
 				ContainSubstring(fmt.Sprintf("memcache_servers=memcached-0.memcached.%s.svc:11211,memcached-1.memcached.%s.svc:11211,memcached-2.memcached.%s.svc:11211",
 					novaNames.Namespace, novaNames.Namespace, novaNames.Namespace)))

diff --git a/test/functional/novaapi_controller_test.go b/test/functional/novaapi_controller_test.go
@@ -214,6 +214,8 @@ var _ = Describe("NovaAPI controller", func() {
 				Expect(configData).Should(ContainSubstring("www_authenticate_uri = keystone-public-auth-url"))
 				Expect(configData).Should(
 					ContainSubstring("[upgrade_levels]\ncompute = auto"))
+				Expect(configData).Should(
+					ContainSubstring("backend = dogpile.cache.memcached"))
 				Expect(configData).Should(
 					ContainSubstring(fmt.Sprintf("memcache_servers=memcached-0.memcached.%s.svc:11211,memcached-1.memcached.%s.svc:11211,memcached-2.memcached.%s.svc:11211",
 						novaNames.Namespace, novaNames.Namespace, novaNames.Namespace)))
@@ -1038,6 +1040,8 @@ var _ = Describe("NovaAPI controller", func() {
 			Expect(configData).Should(ContainSubstring("SSLCertificateKeyFile   \"/etc/pki/tls/private/public.key\""))
 
 			configData = string(configDataMap.Data["01-nova.conf"])
+			Expect(configData).Should(
+				ContainSubstring("backend = dogpile.cache.pymemcache"))
 			Expect(configData).Should(
 				ContainSubstring(fmt.Sprintf("memcache_servers=memcached-0.memcached.%s.svc:11211,memcached-1.memcached.%s.svc:11211,memcached-2.memcached.%s.svc:11211",
 					novaNames.Namespace, novaNames.Namespace, novaNames.Namespace)))

diff --git a/test/functional/novaconductor_controller_test.go b/test/functional/novaconductor_controller_test.go
@@ -206,6 +206,8 @@ var _ = Describe("NovaConductor controller", func() {
 				Expect(configData).Should(ContainSubstring("transport_url=rabbit://cell0/fake"))
 				Expect(configData).Should(
 					ContainSubstring("[upgrade_levels]\ncompute = auto"))
+				Expect(configData).Should(
+					ContainSubstring("backend = dogpile.cache.memcached"))
 				Expect(configData).Should(
 					ContainSubstring(fmt.Sprintf("memcache_servers=memcached-0.memcached.%s.svc:11211,memcached-1.memcached.%s.svc:11211,memcached-2.memcached.%s.svc:11211",
 						novaNames.Namespace, novaNames.Namespace, novaNames.Namespace)))
@@ -918,6 +920,8 @@ var _ = Describe("NovaConductor controller", func() {
 			Expect(configDataMap).ShouldNot(BeNil())
 
 			configData := string(configDataMap.Data["01-nova.conf"])
+			Expect(configData).Should(
+				ContainSubstring("backend = dogpile.cache.pymemcache"))
 			Expect(configData).Should(
 				ContainSubstring(fmt.Sprintf("memcache_servers=memcached-0.memcached.%s.svc:11211,memcached-1.memcached.%s.svc:11211,memcached-2.memcached.%s.svc:11211",
 					novaNames.Namespace, novaNames.Namespace, novaNames.Namespace)))