Merge pull request #825 from vakwetu/add_region_support

Add region support

Author: openshift-merge-bot[bot]

internal/controller/autoscaling_controller.go

@@ -735,6 +735,7 @@ func (r *AutoscalingReconciler) generateServiceConfig(
 			instance.Status.DatabaseHostname,
 			autoscaling.DatabaseName),
 		"Timeout": instance.Spec.Aodh.APITimeout,
+		"Region":  keystoneAPI.GetRegion(),
 	}
 
 	prometheusParams := map[string]any{

internal/controller/ceilometer_controller.go

@@ -1275,6 +1275,7 @@ func (r *CeilometerReconciler) generateServiceConfig(
 		"TLS":                 false, // Default to false. Change to true later if TLS enabled
 		"SwiftRole":           false, //
 		"Timeout":             instance.Spec.APITimeout,
+		"Region":              keystoneAPI.GetRegion(),
 	}
 
 	// create httpd  vhost template parameters

internal/controller/cloudkitty_controller.go

@@ -1199,6 +1199,7 @@ func (r *CloudKittyReconciler) generateServiceConfigs(
 	templateParameters["ServicePassword"] = string(ospSecret.Data[instance.Spec.PasswordSelectors.CloudKittyService])
 	templateParameters["KeystoneInternalURL"] = keystoneInternalURL
 	templateParameters["KeystonePublicURL"] = keystonePublicURL
+	templateParameters["Region"] = keystoneAPI.GetRegion()
 	templateParameters["TransportURL"] = string(transportURLSecret.Data["transport_url"])
 	templateParameters["PrometheusHost"] = instance.Status.PrometheusHost
 	templateParameters["PrometheusPort"] = instance.Status.PrometheusPort

templates/autoscaling/config/aodh.conf

@@ -53,6 +53,9 @@ user_domain_name = Default
 project_name = service
 project_domain_name = Default
 service_token_roles_required = True
+{{ if (index . "Region") -}}
+region_name = {{ .Region }}
+{{ end -}}
 
 [service_credentials]
 auth_type=password
@@ -63,6 +66,9 @@ username={{ .AodhUser }}
 user_domain_name=Default
 password={{ .AodhPassword }}
 interface = internalURL
+{{ if (index . "Region") -}}
+region_name = {{ .Region }}
+{{ end -}}
 
 [healthcheck]
 [service_types]

templates/ceilometercentral/config/ceilometer.conf

@@ -16,6 +16,9 @@ username=ceilometer
 user_domain_name=Default
 password={{ .CeilometerPassword }}
 interface = internalURL
+{{ if (index . "Region") -}}
+region_name = {{ .Region }}
+{{ end -}}
 {{- if .TLS }}
 cafile = {{ .CAFile }}
 {{- end }}

templates/ceilometercompute/config/ceilometer.conf

@@ -14,6 +14,9 @@ username=ceilometer
 user_domain_name=Default
 password={{ .CeilometerPassword }}
 interface = internalURL
+{{ if (index . "Region") -}}
+region_name = {{ .Region }}
+{{ end -}}
 
 [compute]
 instance_discovery_method=libvirt_metadata

templates/ceilometeripmi/config/ceilometer.conf

@@ -15,6 +15,9 @@ username=ceilometer
 user_domain_name=Default
 password={{ .CeilometerPassword }}
 interface = internalURL
+{{ if (index . "Region") -}}
+region_name = {{ .Region }}
+{{ end -}}
 
 [coordination]
 backend_url=

templates/cloudkitty/config/cloudkitty.conf

@@ -11,7 +11,9 @@ transport_url = {{ .TransportURL }}
 debug = True
 project_domain_name = default
 user_domain_name = default
-region_name = RegionOne
+{{ if (index . "Region") -}}
+region_name = {{ .Region }}
+{{ end -}}
 tenant_name = service
 project_name = service
 password = {{ .ServicePassword }}
@@ -78,6 +80,9 @@ username = {{ .ServiceUser }}
 auth_url = {{ .KeystoneInternalURL }}
 interface = internal
 auth_type = password
+{{ if (index . "Region") -}}
+region_name = {{ .Region }}
+{{ end -}}
 {{- if .TLS }}
 cafile = {{ .CAFile }}
 {{- end }}