Skip to content

Commit d8c3e60

Browse files
committed
OpenStack provider compatibility for 2.0.0-rc3
1 parent 9a526cd commit d8c3e60

3 files changed

Lines changed: 6 additions & 10 deletions

File tree

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module github.com/codecentric/fleeting-plugin-openstack
22

3-
go 1.21.6
3+
go 1.22
4+
45
toolchain go1.22.3
56

67
require (

provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ func (g *InstanceGroup) createInstance(ctx context.Context) (string, error) {
258258
}
259259
spec.Metadata[MetadataKey] = g.Name
260260

261-
srv, err := servers.Create(ctx, g.computeClient, spec).Extract()
261+
srv, err := servers.Create(ctx, g.computeClient, spec, nil).Extract()
262262
if err != nil {
263263
return "", err
264264
}

utils.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ type ExtCreateOpts struct {
1919
KeyName string `json:"key_name,omitempty"`
2020

2121
// annotation overrides
22-
Networks []servers.Network `json:"networks,omitempty"`
23-
SecurityGroups []string `json:"security_groups,omitempty"`
24-
UserData string `json:"user_data,omitempty"`
25-
SchedulerHints *servers.SchedulerHints `json:"scheduler_hints,omitempty"`
22+
Networks []servers.Network `json:"networks,omitempty"`
23+
SecurityGroups []string `json:"security_groups,omitempty"`
24+
UserData string `json:"user_data,omitempty"`
2625
}
2726

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

42-
if opts.SchedulerHints != nil {
43-
opts.CreateOpts.SchedulerHints = opts.SchedulerHints
44-
}
45-
4641
ob, err := opts.CreateOpts.ToServerCreateMap()
4742
if err != nil {
4843
return nil, err

0 commit comments

Comments
 (0)