Attempt to power off BareMetalHost before delete

controllers/metal3.io/baremetalhost_controller.go

@@ -446,6 +446,9 @@ func (r *BareMetalHostReconciler) actionDeleting(prov provisioner.Provisioner, i
 	if provResult.Dirty {
 		return actionContinue{provResult.RequeueAfter}
 	}
+	if provResult.ErrorMessage != "" {
+		return recordActionFailure(info, metal3v1alpha1.PowerManagementError, provResult.ErrorMessage)
+	}
 
 	// Remove finalizer to allow deletion
 	info.host.Finalizers = utils.FilterStringFromList(

pkg/provisioner/ironic/delete_test.go

@@ -22,6 +22,7 @@ func TestDelete(t *testing.T) {
 		ironic    *testserver.IronicMock
 		inspector *testserver.InspectorMock
 		hostName  string
+		powerOn   bool
 
 		expectedDirty        bool
 		expectedRequestAfter time.Duration
@@ -143,6 +144,27 @@ func TestDelete(t *testing.T) {
 				Value: true,
 			},
 		},
+		{
+			name: "test-power-on",
+			ironic: testserver.NewIronic(t).Node(
+				nodes.Node{
+					UUID:           nodeUUID,
+					ProvisionState: "active",
+					Maintenance:    false,
+					PowerState:     powerOn,
+				},
+			).NodeUpdate(nodes.Node{
+				UUID: nodeUUID,
+			}),
+			powerOn:              true,
+			expectedDirty:        true,
+			expectedRequestAfter: 0,
+			expectedUpdate: &nodes.UpdateOperation{
+				Op:    "replace",
+				Path:  "/maintenance",
+				Value: true,
+			},
+		},
 	}
 
 	for _, tc := range cases {
@@ -171,6 +193,13 @@ func TestDelete(t *testing.T) {
 			if err != nil {
 				t.Fatalf("could not create provisioner: %s", err)
 			}
+			if tc.powerOn {
+				prov.status.ID = nodeUUID
+				_, err = prov.PowerOn()
+				if err != nil {
+					t.Errorf("could not power on server: %s", err)
+				}
+			}
 
 			result, err := prov.Delete()
 

pkg/provisioner/ironic/ironic.go

@@ -55,6 +55,10 @@ const (
 	powerOff     = "power off"
 	softPowerOff = "soft power off"
 	powerNone    = "None"
+
+	// Maximum number of times node Power off would be retried before
+	// it would be deleted.
+	maxPowerOffRetryCount = 3
 )
 
 var bootModeCapabilities = map[metal3v1alpha1.BootMode]string{
@@ -1613,6 +1617,20 @@ func (p *ironicProvisioner) Delete() (result provisioner.Result, err error) {
 		return p.setMaintenanceFlag(ironicNode, true)
 	}
 
+	if ironicNode.PowerState == powerOn && p.host.Status.ErrorCount <= maxPowerOffRetryCount {
+		p.log.Info("host ready to be powered off")
+		_, err := p.hardPowerOff()
+		if err != nil {
+			switch err.(type) {
+			case HostLockedError:
+				p.log.Info("could not power off host, busy")
+				return retryAfterDelay(powerRequeueDelay)
+			default:
+				return operationFailed("failed to power off host")
+			}
+		}
+	}
+
 	p.log.Info("host ready to be removed")
 	err = nodes.Delete(p.client, ironicNode.UUID).ExtractErr()
 	switch err.(type) {