iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated to comments in PR#6490 - Thanks @haxorof

This commit is contained in:
Tom Carrio 2018-07-20 07:51:00 -04:00
parent db3d2682b5
commit 036918b81b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builder/openstack/image_query.go
View File

@ -100,6 +100,7 @@ func applyMostRecent(listOpts *images.ListOpts) {
// Sort isn't supported through our API so there should be no existing values.
// Overwriting .Sort is okay.
listOpts.Sort = mostRecentSort
listOpts.Limit = 1
return
}

12
builder/openstack/step_source_image_info.go
View File

@ -26,7 +26,7 @@ func (s *StepSourceImageInfo) Run(_ context.Context, state multistep.StateBag) m
config := state.Get("config").(Config)
ui := state.Get("ui").(packer.Ui)
client, err := config.computeV2Client()
client, err := config.imageV2Client()
// if an ID is provided we skip the filter since that will return a single or no image
if s.SourceImage != "" {
@ -38,11 +38,11 @@ func (s *StepSourceImageInfo) Run(_ context.Context, state multistep.StateBag) m
// build ListOpts from filters
if len(s.ImageFilters.Filters) > 0 {
err = buildImageFilters(s.ImageFilters.Filters, params)
if err != nil {
err := fmt.Errorf("Errors encountered in filter parsing.\n%s" + err.Error())
errs := buildImageFilters(s.ImageFilters.Filters, params)
if len(errs.Errors) > 0 {
err := fmt.Errorf("Errors encountered in filter parsing.\n%s" + errs.Error())
state.Put("error", err)
ui.Error(err.Error())
ui.Error(errs.Error())
return multistep.ActionHalt
}
}
@ -87,7 +87,7 @@ func (s *StepSourceImageInfo) Run(_ context.Context, state multistep.StateBag) m
ui.Message(fmt.Sprintf("Found Image ID: %s", image.ID))
state.Put("source_image", image)
state.Put("source_image", image.ID)
return multistep.ActionContinue
}