Skip to content

Commit 0e60215

Browse files
Merge pull request openshift#8317 from honza/bootstrap-arch
OCPBUGS-33006: baremetal: set bootstrap domain arch
2 parents 55f8072 + 7857de6 commit 0e60215

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

pkg/infrastructure/baremetal/bootstrap.go

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,33 @@ func createIgnition(virConn *libvirt.Libvirt, config baremetalConfig, pool libvi
276276

277277
return nil
278278
}
279+
280+
func getCapabilities(virConn *libvirt.Libvirt) (libvirtxml.Caps, error) {
281+
var caps libvirtxml.Caps
282+
283+
capsBytes, err := virConn.Capabilities()
284+
if err != nil {
285+
return caps, err
286+
}
287+
288+
err = xml.Unmarshal(capsBytes, &caps)
289+
if err != nil {
290+
return caps, err
291+
}
292+
293+
return caps, nil
294+
}
295+
279296
func createBootstrapDomain(virConn *libvirt.Libvirt, config baremetalConfig, pool libvirt.StoragePool, volume libvirt.StorageVol) error {
280297
bootstrapDom := newDomain(fmt.Sprintf("%s-bootstrap", config.ClusterID))
281298

299+
capabilities, err := getCapabilities(virConn)
300+
if err != nil {
301+
return fmt.Errorf("failed to get libvirt capabilities: %w", err)
302+
}
303+
304+
bootstrapDom.OS.Type.Arch = capabilities.Host.CPU.Arch
305+
282306
for _, bridge := range config.Bridges {
283307
netIface := libvirtxml.DomainInterface{
284308
Model: &libvirtxml.DomainInterfaceModel{

0 commit comments

Comments
 (0)