Skip to content

Commit

Permalink
Pass default domain ID keystoneservice project/service user
Browse files Browse the repository at this point in the history
With [1] the domain ID can be passed to project and user resurces.
For now lets just pass in the default domain ID.

[1]] ttps://github.com/openstack-k8s-operators/lib-common/pull/314
  • Loading branch information
stuggi committed Aug 1, 2023
1 parent fa8b539 commit c173287
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion controllers/keystoneservice_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,9 @@ func (r *KeystoneServiceReconciler) reconcileDelete(
// Delete User
err := os.DeleteUser(
l,
instance.Spec.ServiceUser)
instance.Spec.ServiceUser,
"default",
)
if err != nil {
return ctrl.Result{}, err
}
Expand Down Expand Up @@ -456,6 +458,7 @@ func (r *KeystoneServiceReconciler) reconcileUser(
openstack.Project{
Name: "service",
Description: "service",
DomainID: "default",
})
if err != nil {
return ctrl.Result{}, err
Expand All @@ -470,6 +473,7 @@ func (r *KeystoneServiceReconciler) reconcileUser(
Name: instance.Spec.ServiceUser,
Password: password,
ProjectID: serviceProjectID,
DomainID: "default",
})
if err != nil {
return ctrl.Result{}, err
Expand Down

0 comments on commit c173287

Please sign in to comment.