Skip to content
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

Jump to bottom

Bug 1913736: do not fetch image id when booting from volume #148

Merged
merged 1 commit into from
Jan 7, 2021
Merged

Bug 1913736: do not fetch image id when booting from volume #148

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions pkg/cloud/openstack/clients/machineservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,9 +551,13 @@ func (is *InstanceService) InstanceCreate(clusterName string, name string, clust
is.computeClient.Microversion = "2.52"
}

imageID, err := imageutils.IDFromName(is.imagesClient, config.Image)
if err != nil {
return nil, fmt.Errorf("Create new server err: %v", err)
var imageID string

if config.RootVolume == nil {
imageID, err = imageutils.IDFromName(is.imagesClient, config.Image)
if err != nil {
return nil, fmt.Errorf("Create new server err: %v", err)
}
}

flavorID, err := flavorutils.IDFromName(is.computeClient, config.Flavor)
Expand Down
10 changes: 6 additions & 4 deletions pkg/cloud/openstack/machine/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,10 +699,12 @@ func (oc *OpenstackClient) validateMachine(machine *machinev1.Machine) error {

// TODO(mfedosin): add more validations here

// Validate that image exists
err = machineService.DoesImageExist(machineSpec.Image)
if err != nil {
return err
// Validate that image exists when not booting from volume
if machineSpec.RootVolume == nil {
err = machineService.DoesImageExist(machineSpec.Image)
if err != nil {
return err
}
}

// Validate that flavor exists
Expand Down