Skip to content

Commit

Permalink
OpenStack provider compatibility for 2.0.0-rc3
Browse files Browse the repository at this point in the history
  • Loading branch information
T4cC0re committed Jun 7, 2024
1 parent 4a19bf3 commit 875e6ec
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module github.com/codecentric/fleeting-plugin-openstack

go 1.21.6
go 1.22

toolchain go1.22.3

require (
Expand Down
2 changes: 1 addition & 1 deletion provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ func (g *InstanceGroup) createInstance(ctx context.Context) (string, error) {
}
spec.Metadata[MetadataKey] = g.Name

srv, err := servers.Create(ctx, g.computeClient, spec).Extract()
srv, err := servers.Create(ctx, g.computeClient, spec, nil).Extract()
if err != nil {
return "", err
}
Expand Down
11 changes: 3 additions & 8 deletions utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ type ExtCreateOpts struct {
KeyName string `json:"key_name,omitempty"`

// annotation overrides
Networks []servers.Network `json:"networks,omitempty"`
SecurityGroups []string `json:"security_groups,omitempty"`
UserData string `json:"user_data,omitempty"`
SchedulerHints *servers.SchedulerHints `json:"scheduler_hints,omitempty"`
Networks []servers.Network `json:"networks,omitempty"`
SecurityGroups []string `json:"security_groups,omitempty"`
UserData string `json:"user_data,omitempty"`
}

// ToServerCreateMap for extended opts
Expand All @@ -39,10 +38,6 @@ func (opts ExtCreateOpts) ToServerCreateMap() (map[string]interface{}, error) {
opts.CreateOpts.UserData = []byte(opts.UserData)
}

if opts.SchedulerHints != nil {
opts.CreateOpts.SchedulerHints = opts.SchedulerHints
}

ob, err := opts.CreateOpts.ToServerCreateMap()
if err != nil {
return nil, err
Expand Down

0 comments on commit 875e6ec

Please sign in to comment.