diff --git a/internal/controller/cloudkitty_controller.go b/internal/controller/cloudkitty_controller.go index 80869014e..623931be3 100644 --- a/internal/controller/cloudkitty_controller.go +++ b/internal/controller/cloudkitty_controller.go @@ -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 diff --git a/templates/cloudkitty/config/cloudkitty.conf b/templates/cloudkitty/config/cloudkitty.conf index 80ba122e1..710bd2bfb 100644 --- a/templates/cloudkitty/config/cloudkitty.conf +++ b/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 }}