From 875e6ecaf4ddbea0445933cc5cb6289fe1c43e83 Mon Sep 17 00:00:00 2001 From: Hendrik 'T4cC0re' Meyer Date: Fri, 7 Jun 2024 11:03:53 +0200 Subject: [PATCH] OpenStack provider compatibility for 2.0.0-rc3 --- go.mod | 3 ++- provider.go | 2 +- utils.go | 11 +++-------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 0593b96..2c08cf5 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,7 @@ module github.com/codecentric/fleeting-plugin-openstack -go 1.21.6 +go 1.22 + toolchain go1.22.3 require ( diff --git a/provider.go b/provider.go index d0b0348..5eafc84 100644 --- a/provider.go +++ b/provider.go @@ -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 } diff --git a/utils.go b/utils.go index cabd8ac..f5e8819 100644 --- a/utils.go +++ b/utils.go @@ -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 @@ -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