diff --git a/internal/controller/placementapi_controller.go b/internal/controller/placementapi_controller.go index 4287646a..db19bd55 100644 --- a/internal/controller/placementapi_controller.go +++ b/internal/controller/placementapi_controller.go @@ -1370,6 +1370,7 @@ func (r *PlacementAPIReconciler) generateServiceConfigMaps( "KeystonePublicURL": keystonePublicURL, "PlacementPassword": string(ospSecret.Data[instance.Spec.PasswordSelectors.Service]), "log_file": "/var/log/placement/placement-api.log", + "Region": keystoneAPI.GetRegion(), "DatabaseConnection": fmt.Sprintf("mysql+pymysql://%s:%s@%s/%s?read_default_file=/etc/my.cnf", databaseAccount.Spec.UserName, string(dbSecret.Data[mariadbv1.DatabasePasswordSelector]), diff --git a/templates/placementapi/config/placement.conf b/templates/placementapi/config/placement.conf index 2cdbd2f8..71295afa 100644 --- a/templates/placementapi/config/placement.conf +++ b/templates/placementapi/config/placement.conf @@ -20,6 +20,9 @@ user_domain_name = Default project_name = service username = {{ .ServiceUser }} password = {{ .PlacementPassword }} +{{ if (index . "Region") -}} +region_name = {{ .Region }} +{{ end -}} www_authenticate_uri = {{ .KeystonePublicURL }} auth_url = {{ .KeystoneInternalURL }} auth_type = password