Merge pull request #881 from jichenjc/bug/879

k8s-ci-robot · web-flow · commit 4c2b4db41eb4 · 2021-05-26T02:25:21.000-07:00
honor server group ID parm
diff --git a/pkg/cloud/services/compute/instance.go b/pkg/cloud/services/compute/instance.go
@@ -84,6 +84,7 @@ func (s *Service) CreateInstance(openStackCluster *infrav1.OpenStackCluster, mac
 		FailureDomain: *machine.Spec.FailureDomain,
 		RootVolume:    openStackMachine.Spec.RootVolume,
 		Subnet:        openStackMachine.Spec.Subnet,
+		ServerGroupID: openStackMachine.Spec.ServerGroupID,
 	}
 
 	if openStackMachine.Spec.Trunk {

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ func (s Service) CreateInstance(openStackCluster infrav1.OpenStackCluster, mac`
`84`	`84`	`FailureDomain: *machine.Spec.FailureDomain,`
`85`	`85`	`RootVolume: openStackMachine.Spec.RootVolume,`
`86`	`86`	`Subnet: openStackMachine.Spec.Subnet,`
	`87`	`+ ServerGroupID: openStackMachine.Spec.ServerGroupID,`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`if openStackMachine.Spec.Trunk {`