Fix region_name placement in config template and test

Move region_name to after auth settings in the keystone_authtoken
section and update test to verify it appears in that section.

Author: xek

templates/placementapi/config/placement.conf

@@ -15,9 +15,6 @@ connection = {{ .DatabaseConnection }}
 auth_strategy = keystone
 
 [keystone_authtoken]
-{{ if (index . "Region") -}}
-region_name = {{ .Region }}
-{{ end -}}
 www_authenticate_uri = {{ .KeystonePublicURL }}
 auth_url = {{ .KeystoneInternalURL }}
 {{ if .UseApplicationCredentials -}}
@@ -32,6 +29,9 @@ user_domain_name = Default
 project_domain_name = Default
 project_name = service
 {{- end }}
+{{ if (index . "Region") -}}
+region_name = {{ .Region }}
+{{ end -}}
 interface = internal
 
 [oslo_policy]

test/functional/placementapi_controller_test.go

@@ -374,11 +374,10 @@ var _ = Describe("PlacementAPI controller", func() {
 			// Verify region_name is set in [keystone_authtoken] section
 			// GetRegion() returns Status.Region, so check that
 			Expect(keystoneAPI.Status.Region).ToNot(BeEmpty(), "KeystoneAPI should have a region set in status")
-			// The region_name should appear in the [keystone_authtoken] section
-			// It's conditionally rendered, so check it appears between password and www_authenticate_uri
+			// The region_name should appear in the [keystone_authtoken] section (before [oslo_policy])
 			Expect(conf).Should(
 				MatchRegexp(fmt.Sprintf(
-					"password = .*\\nregion_name = %s\\n", keystoneAPI.Status.Region)))
+					`\[keystone_authtoken\][\s\S]*region_name = %s[\s\S]*\[oslo_policy\]`, keystoneAPI.Status.Region)))
 		})
 
 		It("creates service account, role and rolebindig", func() {