Skip to content

Commit 39077f9

Browse files
committed
Add initrd after iso
1 parent 6a74123 commit 39077f9

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

pkg/provisioner/ironic/ironic.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,10 +564,11 @@ func (p *ironicProvisioner) PreprovisioningImageFormats() ([]metal3v1alpha1.Imag
564564
return nil, err
565565
}
566566

567-
formats := []metal3v1alpha1.ImageFormat{metal3v1alpha1.ImageFormatInitRD}
567+
var formats []metal3v1alpha1.ImageFormat
568568
if accessDetails.SupportsISOPreprovisioningImage() {
569569
formats = append(formats, metal3v1alpha1.ImageFormatISO)
570570
}
571+
formats = append(formats, metal3v1alpha1.ImageFormatInitRD)
571572

572573
return formats, nil
573574
}

pkg/provisioner/ironic/validatemanagementaccess_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ func TestPreprovisioningImageFormats(t *testing.T) {
836836
Name: "enabled virtualmedia",
837837
Address: "redfish-virtualmedia://example.test",
838838
PreprovImgEnabled: true,
839-
Expected: []metal3v1alpha1.ImageFormat{"initrd", "iso"},
839+
Expected: []metal3v1alpha1.ImageFormat{"iso", "initrd"},
840840
},
841841
}
842842

0 commit comments

Comments
 (0)