Merge pull request #560 from qvicksilver/fix-#559

Make DisablePortSecurity compatible with platforms not using the port…

Author: k8s-ci-robot

pkg/cloud/services/networking/network.go

@@ -57,16 +57,18 @@ func (s *Service) ReconcileNetwork(clusterName string, openStackCluster *infrav1
 		return nil
 	}
 
-	var portSecurityEnabled gophercloud.EnabledState
+	var opts createOpts
 	if openStackCluster.Spec.DisablePortSecurity {
-		portSecurityEnabled = gophercloud.Disabled
+		opts = createOpts{
+			AdminStateUp:        gophercloud.Enabled,
+			Name:                networkName,
+			PortSecurityEnabled: gophercloud.Disabled,
+		}
 	} else {
-		portSecurityEnabled = gophercloud.Enabled
-	}
-	opts := createOpts{
-		AdminStateUp:        gophercloud.Enabled,
-		Name:                networkName,
-		PortSecurityEnabled: portSecurityEnabled,
+		opts = createOpts{
+			AdminStateUp: gophercloud.Enabled,
+			Name:         networkName,
+		}
 	}
 	network, err := networks.Create(s.client, opts).Extract()
 	if err != nil {