Skip to content

Commit 9250c73

Browse files
committed
review
Signed-off-by: MatthieuFin <[email protected]>
1 parent 4bdd8e8 commit 9250c73

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

controllers/openstackmachine_controller.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,13 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
391391
Address: instanceStatus.Name(),
392392
})
393393
openStackMachine.Status.Addresses = addresses
394-
if openStackMachine.Spec.IdentityRef == nil {
395-
openStackMachine.Spec.IdentityRef = &openStackCluster.Spec.IdentityRef
394+
395+
// Retreive openStackServer object to set openStackMachine IdentityRef field with inherit feature from cluster object.
396+
server, err := r.getOrCreateMachineServer(ctx, openStackCluster, openStackMachine, machine)
397+
if err != nil {
398+
return ctrl.Result{}, fmt.Errorf("Failed to get or create OpenStackServer: %w", err)
396399
}
400+
openStackMachine.Spec.IdentityRef = &server.Spec.IdentityRef
397401

398402
result := r.reconcileMachineState(scope, openStackMachine, machine, machineServer)
399403
if result != nil {

0 commit comments

Comments
 (0)