From 807a09a770d21678ff953dc020350aa8aba9c16e Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Fri, 8 May 2020 16:42:11 -0700 Subject: [PATCH 1/2] don't error if metadata can't be set. Old versions of openstack don't seem to play nicely with this API call --- builder/openstack/step_create_image.go | 1 - 1 file changed, 1 deletion(-) diff --git a/builder/openstack/step_create_image.go b/builder/openstack/step_create_image.go index b70a119b1..a6a9c3c34 100644 --- a/builder/openstack/step_create_image.go +++ b/builder/openstack/step_create_image.go @@ -65,7 +65,6 @@ func (s *stepCreateImage) Run(ctx context.Context, state multistep.StateBag) mul err := fmt.Errorf("Error setting image metadata: %s", err) state.Put("error", err) ui.Error(err.Error()) - return multistep.ActionHalt } } From fe472f45ae0e4a7bad6b38ae8f02909e7539a814 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Tue, 12 May 2020 16:37:50 -0700 Subject: [PATCH 2/2] don't put error in state, or we'll fail. --- builder/openstack/step_create_image.go | 1 - 1 file changed, 1 deletion(-) diff --git a/builder/openstack/step_create_image.go b/builder/openstack/step_create_image.go index a6a9c3c34..637e3c70e 100644 --- a/builder/openstack/step_create_image.go +++ b/builder/openstack/step_create_image.go @@ -63,7 +63,6 @@ func (s *stepCreateImage) Run(ctx context.Context, state multistep.StateBag) mul }).ExtractErr() if err != nil { err := fmt.Errorf("Error setting image metadata: %s", err) - state.Put("error", err) ui.Error(err.Error()) } }