Skip to content

OCPBUGS-33006: baremetal: set bootstrap domain arch #8317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 30, 2024
Merged

OCPBUGS-33006: baremetal: set bootstrap domain arch #8317

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions pkg/infrastructure/baremetal/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,33 @@ func createIgnition(virConn *libvirt.Libvirt, config baremetalConfig, pool libvi

return nil
}

func getCapabilities(virConn *libvirt.Libvirt) (libvirtxml.Caps, error) {
var caps libvirtxml.Caps

capsBytes, err := virConn.Capabilities()
if err != nil {
return caps, err
}

err = xml.Unmarshal(capsBytes, &caps)
if err != nil {
return caps, err
}

return caps, nil
}

func createBootstrapDomain(virConn *libvirt.Libvirt, config baremetalConfig, pool libvirt.StoragePool, volume libvirt.StorageVol) error {
bootstrapDom := newDomain(fmt.Sprintf("%s-bootstrap", config.ClusterID))

capabilities, err := getCapabilities(virConn)
if err != nil {
return fmt.Errorf("failed to get libvirt capabilities: %w", err)
}

bootstrapDom.OS.Type.Arch = capabilities.Host.CPU.Arch
Copy link
Member

@zaneb zaneb Apr 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like it would be less confusing to pass the hypervisor capabilities to newDomain()


for _, bridge := range config.Bridges {
netIface := libvirtxml.DomainInterface{
Model: &libvirtxml.DomainInterfaceModel{
Expand Down