Merge pull request #255 from rabi/port_regression

Fix regression when assigning provision server port

api/v1beta1/openstackprovisionserver.go

@@ -65,7 +65,8 @@ func AssignProvisionServerPort(
 
 		if found {
 			if existingPorts[instance.GetName()] != cur {
-				return fmt.Errorf("%v port already used by another OpeStackProvisionServer", cur)
+				// continue to use the next port in the port range.
+				continue
 			} else {
 				break
 			}

api/v1beta1/openstackprovisionserver_webhook.go

@@ -81,7 +81,7 @@ func (r *OpenStackProvisionServer) validateCr() error {
 
 	for name, port := range existingPorts {
 		if name != r.Name && port == r.Spec.Port {
-			return fmt.Errorf("port %d is already in use", port)
+			return fmt.Errorf("port %d is already in use by another OpeStackProvisionServer", port)
 		}
 	}
 
@@ -115,13 +115,15 @@ func (r *OpenStackProvisionServer) Default() {
 	if r.Spec.OSImage == "" {
 		r.Spec.OSImage = openstackProvisionServerDefaults.OSImage
 	}
-	err := AssignProvisionServerPort(context.TODO(), webhookClient, r,
-		ProvisionServerPortStart, ProvisionServerPortEnd)
-	if err != nil {
-		// If this occurs, it will also be caught just after this defaulting webhook in the
-		// validating webhook, because that webhook calls the same underlying function that
-		// checks for the availability of ports.  That will cause the create/update of the
-		// CR to fail and halt moving forward.
-		openstackprovisionserverlog.Error(err, "Cannot assign port for OpenStackProvisionServer", "OpenStackProvisionServer", r)
+	if r.Spec.Port == 0 {
+		err := AssignProvisionServerPort(context.TODO(), webhookClient, r,
+			ProvisionServerPortStart, ProvisionServerPortEnd)
+		if err != nil {
+			// If this occurs, it will also be caught just after this defaulting webhook in the
+			// validating webhook, because that webhook calls the same underlying function that
+			// checks for the availability of ports.  That will cause the create/update of the
+			// CR to fail and halt moving forward.
+			openstackprovisionserverlog.Error(err, "Cannot assign port for OpenStackProvisionServer", "OpenStackProvisionServer", r)
+		}
 	}
 }