Skip to content

Add region support #825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
Jan 20, 2026
Merged

Add region support #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86c3070
Add region support
vakwetu Dec 22, 2025
075dc08
Add region_name support to Ceilometer and Aodh configurations
vakwetu Jan 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions internal/controller/autoscaling_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,7 @@ func (r *AutoscalingReconciler) generateServiceConfig(
instance.Status.DatabaseHostname,
autoscaling.DatabaseName),
"Timeout": instance.Spec.Aodh.APITimeout,
"Region": keystoneAPI.GetRegion(),
}

prometheusParams := map[string]any{
Expand Down
1 change: 1 addition & 0 deletions internal/controller/ceilometer_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,6 +1261,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
Expand Down
1 change: 1 addition & 0 deletions internal/controller/cloudkitty_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,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
Expand Down
6 changes: 6 additions & 0 deletions templates/autoscaling/config/aodh.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -63,6 +66,9 @@ username={{ .AodhUser }}
user_domain_name=Default
password={{ .AodhPassword }}
interface = internalURL
{{ if (index . "Region") -}}
region_name = {{ .Region }}
{{ end -}}

[healthcheck]
[service_types]
Expand Down
3 changes: 3 additions & 0 deletions templates/ceilometercentral/config/ceilometer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 3 additions & 0 deletions templates/ceilometercompute/config/ceilometer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions templates/ceilometeripmi/config/ceilometer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ username=ceilometer
user_domain_name=Default
password={{ .CeilometerPassword }}
interface = internalURL
{{ if (index . "Region") -}}
region_name = {{ .Region }}
{{ end -}}

[coordination]
backend_url=
Expand Down
7 changes: 6 additions & 1 deletion templates/cloudkitty/config/cloudkitty.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down