Add region support

Author: vakwetu

internal/controller/manila_controller.go

@@ -1013,6 +1013,7 @@ func (r *ManilaReconciler) generateServiceConfig(
 		"MemcachedServersWithInet": memcached.GetMemcachedServerListWithInetString(),
 		"MemcachedServers":         memcached.GetMemcachedServerListString(),
 		"TimeOut":                  instance.Spec.APITimeout,
+		"Region":                   keystoneAPI.GetRegion(),
 	}
 
 	// MTLS

templates/manila/config/00-config.conf

@@ -38,6 +38,9 @@ project_name = service
 username = {{ .ServiceUser }}
 password = {{ .ServicePassword }}
 interface = internal
+{{ if (index . "Region") -}}
+region_name = {{ .Region }}
+{{ end -}}
 {{if (index . "MemcachedAuthCert")}}
 memcache_tls_certfile = {{ .MemcachedAuthCert }}
 memcache_tls_keyfile = {{ .MemcachedAuthKey }}
@@ -53,6 +56,9 @@ project_name=service
 user_domain_name=Default
 username = {{ .ServiceUser }}
 password = {{ .ServicePassword }}
+{{ if (index . "Region") -}}
+region_name = {{ .Region }}
+{{ end -}}
 
 [nova]
 interface = internal
@@ -63,6 +69,9 @@ password = {{ .ServicePassword }}
 user_domain_name = Default
 project_name = service
 project_domain_name = Default
+{{ if (index . "Region") -}}
+region_name = {{ .Region }}
+{{ end -}}
 
 [oslo_concurrency]
 lock_path=/tmp/manila/manila_locks
@@ -110,6 +119,9 @@ project_name=service
 user_domain_name=Default
 username = {{ .ServiceUser }}
 password = {{ .ServicePassword }}
+{{ if (index . "Region") -}}
+region_name = {{ .Region }}
+{{ end -}}
 
 [key_manager]
 backend = barbican

test/functional/manila_controller_test.go

@@ -1338,6 +1338,51 @@ var _ = Describe("Manila controller", func() {
 				g.Expect(conf).To(ContainSubstring("amqp_durable_queues=true"))
 			}, timeout, interval).Should(Succeed())
 		})
+
+		It("includes region_name in config when KeystoneAPI has region set", func() {
+			const testRegion = "regionTwo"
+			// Create and update KeystoneAPI with region in status
+			keystoneAPIName := keystone.CreateKeystoneAPI(manilaTest.Instance.Namespace)
+			DeferCleanup(keystone.DeleteKeystoneAPI, keystoneAPIName)
+			keystoneAPI := keystone.GetKeystoneAPI(keystoneAPIName)
+			keystoneAPI.Status.Region = testRegion
+			keystoneAPI.Status.APIEndpoints = map[string]string{
+				"internal": "http://keystone-internal-openstack.testing",
+				"public":   "http://keystone-public-openstack.testing",
+			}
+			Eventually(func(g Gomega) {
+				g.Expect(k8sClient.Status().Update(ctx, keystoneAPI.DeepCopy())).Should(Succeed())
+			}, timeout, interval).Should(Succeed())
+
+			// Trigger reconciliation
+			th.ExpectCondition(
+				manilaTest.Instance,
+				ConditionGetterFunc(ManilaConditionGetter),
+				condition.ServiceConfigReadyCondition,
+				corev1.ConditionTrue,
+			)
+
+			configSecret := th.GetSecret(manilaTest.ManilaConfigSecret)
+			Expect(configSecret).ShouldNot(BeNil())
+			Expect(configSecret.Data).Should(HaveKey("00-config.conf"))
+			configData := string(configSecret.Data["00-config.conf"])
+
+			// Verify region_name in [keystone_authtoken]
+			Expect(configData).Should(ContainSubstring(
+				fmt.Sprintf("[keystone_authtoken]\nregion_name = %s", testRegion)))
+
+			// Verify region_name in [neutron]
+			Expect(configData).Should(ContainSubstring(
+				fmt.Sprintf("[neutron]\nregion_name = %s", testRegion)))
+
+			// Verify region_name in [nova]
+			Expect(configData).Should(ContainSubstring(
+				fmt.Sprintf("[nova]\nregion_name = %s", testRegion)))
+
+			// Verify region_name in [barbican]
+			Expect(configData).Should(ContainSubstring(
+				fmt.Sprintf("[barbican]\nregion_name = %s", testRegion)))
+		})
 	})
 
 	When("Manila is created with quorum queues disabled in transport secret", func() {