feat(hatchery:openstack): set security groups (#6573)

ovh · Jun 19, 2023 · 8ba2137 · 8ba2137
1 parent 058d9af
commit 8ba2137
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/engine/hatchery/openstack/spawn.go b/engine/hatchery/openstack/spawn.go
@@ -139,14 +139,18 @@ func (h *HatcheryOpenstack) SpawnWorker(ctx context.Context, spawnArgs hatchery.
 		}
 
 		networks := []servers.Network{{UUID: h.networkID, FixedIP: ip}}
-		r := servers.Create(h.openstackClient, servers.CreateOpts{
+		opts := servers.CreateOpts{
 			Name:      spawnArgs.WorkerName,
 			FlavorRef: flavor.ID,
 			ImageRef:  imageID,
 			Metadata:  meta,
 			UserData:  []byte(udata64),
 			Networks:  networks,
-		})
+		}
+		r := servers.Create(h.openstackClient, opts)
+		if len(h.Config.DefaultSecurityGroups) > 0 {
+			opts.SecurityGroups = h.Config.DefaultSecurityGroups
+		}
 
 		server, err := r.Extract()
 		if err != nil {

diff --git a/engine/hatchery/openstack/types.go b/engine/hatchery/openstack/types.go
@@ -58,6 +58,9 @@ type HatcheryConfiguration struct {
 
 	// DefaultFlavor, if set the hatchery will use a model with the default flavor in priority to start jobs without model requirement
 	DefaultFlavor string `mapstructure:"defaultFlavor" toml:"defaultFlavor" default:"" commented:"true" comment:"If set the hatchery will use a model with the default flavor in priority to start jobs without model requirement" json:"defaultFlavor"`
+
+	// DefaultSecurityGroups, if set the VMs spawned by the hatchery will have the given security groups
+	DefaultSecurityGroups []string `mapstructure:"defaultSecurityGroups" toml:"defaultSecurityGroups" default:"" commented:"true" comment:"If set the hatchery will add given groups on spawned VMs" json:"defaultSecurityGroups"`
 }
 
 // HatcheryOpenstack spawns instances of worker model with type 'ISO'