Skip to content

Fix the issue delete volume based VM twice #127

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

Open
zhenggu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix the issue delete volume based VM twice #127

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions builder/openstack/step_delete_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ func (s *StepDeleteServer) Run(ctx context.Context, state multistep.StateBag) mu
state.Put("error", err)
return multistep.ActionHalt
}
state.Put("instance_id", "")
return multistep.ActionContinue
}

Expand Down
22 changes: 11 additions & 11 deletions builder/openstack/step_run_source_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ type StepRunSourceServer struct {
InstanceMetadata map[string]string
UseBlockStorageVolume bool
ForceDelete bool
server *servers.Server
}

func (s *StepRunSourceServer) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
Expand Down Expand Up @@ -103,49 +102,50 @@ func (s *StepRunSourceServer) Run(ctx context.Context, state multistep.StateBag)
}

ui.Say("Launching server...")
s.server, err = servers.Create(computeClient, serverOptsExt).Extract()
server, err := servers.Create(computeClient, serverOptsExt).Extract()
if err != nil {
err := fmt.Errorf("Error launching source server: %s", err)
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}

ui.Message(fmt.Sprintf("Server ID: %s", s.server.ID))
log.Printf("server id: %s", s.server.ID)
ui.Message(fmt.Sprintf("Server ID: %s", server.ID))
log.Printf("server id: %s", server.ID)

ui.Say("Waiting for server to become ready...")
stateChange := StateChangeConf{
Pending: []string{"BUILD"},
Target: []string{"ACTIVE"},
Refresh: ServerStateRefreshFunc(computeClient, s.server.ID),
Refresh: ServerStateRefreshFunc(computeClient, server.ID),
StepState: state,
}
latestServer, err := WaitForState(&stateChange)
if err != nil {
err := fmt.Errorf("Error waiting for server (%s) to become ready: %s", s.server.ID, err)
err := fmt.Errorf("Error waiting for server (%s) to become ready: %s", server.ID, err)
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}

s.server = latestServer.(*servers.Server)
state.Put("server", s.server)
server = latestServer.(*servers.Server)
state.Put("server", server)
// instance_id is the generic term used so that users can have access to the
// instance id inside of the provisioners, used in step_provision.
state.Put("instance_id", s.server.ID)
state.Put("instance_id", server.ID)

return multistep.ActionContinue
}

func (s *StepRunSourceServer) Cleanup(state multistep.StateBag) {
if s.server == nil {
instance := state.Get("instance_id").(string)
if instance == "" {
return
}

ui := state.Get("ui").(packersdk.Ui)

err := DeleteServer(state, s.server.ID)
err := DeleteServer(state, instance)
if err != nil {
ui.Error(err.Error())
}
Expand Down