Merge pull request #247 from mandre/fix-no-allowed-address-pairs

openshift-merge-robot · web-flow · commit 8bd9c35fa7df · 2022-10-20T03:25:35.000-04:00
OCPBUGS-2508: Ensure network defs without subnet follow noAllowedAddressPairs
diff --git a/pkg/cloud/openstack/clients/machineservice.go b/pkg/cloud/openstack/clients/machineservice.go
@@ -587,6 +587,9 @@ func (is *InstanceService) InstanceCreate(clusterName string, name string, clust
 					Profile:      net.Profile,
 					PortSecurity: net.PortSecurity,
 				})
+				if net.NoAllowedAddressPairs {
+					subnetsWithoutAllowedAddressPairs[net.UUID] = struct{}{}
+				}
 			}
 
 			for _, snetParam := range net.Subnets {

Original file line number	Diff line number	Diff line change
`@@ -587,6 +587,9 @@ func (is *InstanceService) InstanceCreate(clusterName string, name string, clust`
`587`	`587`	`Profile: net.Profile,`
`588`	`588`	`PortSecurity: net.PortSecurity,`
`589`	`589`	`})`
	`590`	`+ if net.NoAllowedAddressPairs {`
	`591`	`+ subnetsWithoutAllowedAddressPairs[net.UUID] = struct{}{}`
	`592`	`+ }`
`590`	`593`	`}`
`591`	`594`
`592`	`595`	`for _, snetParam := range net.Subnets {`