Merge pull request #1151 from chdxD1/always-add-initrd

metal3-io-bot · web-flow · commit 853f26c394d4 · 2022-09-20T14:54:03.000+03:00
ironic: Always add ImageFormatInitRD to supported formats
diff --git a/pkg/provisioner/ironic/ironic.go b/pkg/provisioner/ironic/ironic.go
@@ -573,9 +573,7 @@ func (p *ironicProvisioner) PreprovisioningImageFormats() ([]metal3v1alpha1.Imag
 	if accessDetails.SupportsISOPreprovisioningImage() {
 		formats = append(formats, metal3v1alpha1.ImageFormatISO)
 	}
-	if p.config.deployKernelURL != "" {
-		formats = append(formats, metal3v1alpha1.ImageFormatInitRD)
-	}
+	formats = append(formats, metal3v1alpha1.ImageFormatInitRD)
 
 	return formats, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -573,9 +573,7 @@ func (p *ironicProvisioner) PreprovisioningImageFormats() ([]metal3v1alpha1.Imag`
`573`	`573`	`if accessDetails.SupportsISOPreprovisioningImage() {`
`574`	`574`	`formats = append(formats, metal3v1alpha1.ImageFormatISO)`
`575`	`575`	`}`
`576`		`- if p.config.deployKernelURL != "" {`
`577`		`- formats = append(formats, metal3v1alpha1.ImageFormatInitRD)`
`578`		`- }`
	`576`	`+ formats = append(formats, metal3v1alpha1.ImageFormatInitRD)`
`579`	`577`
`580`	`578`	`return formats, nil`
`581`	`579`	`}`