Skip to content
Merged
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions pkg/cloud/services/compute/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ func (s *Service) createInstance(clusterName string, i *infrav1.Instance) (*infr
KeyName: i.SSHKeyName,
}).Extract()
if err != nil {
if errd := deletePorts(s, portsList); errd != nil {
return nil, fmt.Errorf("error recover creating Openstack instance: %v", errd)
}
return nil, fmt.Errorf("error creating Openstack instance: %v", err)
}
instanceCreateTimeout := getTimeout("CLUSTER_API_OPENSTACK_INSTANCE_CREATE_TIMEOUT", TimeoutInstanceCreate)
Expand Down Expand Up @@ -481,6 +484,22 @@ func createPort(is *Service, clusterName string, name string, net *infrav1.Netwo
return *newPort, nil
}

func deletePorts(s *Service, nets []servers.Network) error {

for _, n := range nets {
_, err := ports.Get(s.networkClient, n.Port).Extract()
if err != nil {
if capoerrors.IsNotFound(err) {
return nil
}
}
if err := ports.Delete(s.networkClient, n.Port).ExtractErr(); err != nil {
return err
}
}
return nil
}

// Helper function for getting image ID from name
func getImageID(is *Service, imageName string) (string, error) {
if imageName == "" {
Expand Down