Merge pull request #289 from rabi/node_vlan

Move ctlplaneVlan and ctlplaneGateway to InstanceSpec

Author: openshift-merge-bot[bot]

api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml

@@ -83,6 +83,13 @@ spec:
                     ctlPlaneIP:
                       description: CtlPlaneIP - Control Plane IP in CIDR notation
                       type: string
+                    ctlplaneGateway:
+                      description: 'CtlplaneGateway - IP of gateway for ctrlplane
+                        network (TODO: acquire this is another manner?)'
+                      type: string
+                    ctlplaneVlan:
+                      description: CtlplaneVlan - Vlan for ctlplane network
+                      type: integer
                     networkData:
                       description: NetworkData - Host Network Data
                       properties:

api/v1beta1/openstackbaremetalset_types.go

@@ -34,6 +34,12 @@ type InstanceSpec struct {
 	// +kubebuilder:validation:Optional
 	// CtlPlaneIP - Control Plane IP in CIDR notation
 	CtlPlaneIP string `json:"ctlPlaneIP,omitempty"`
+	// CtlplaneGateway - IP of gateway for ctrlplane network (TODO: acquire this is another manner?)
+	// +kubebuilder:validation:Optional
+	CtlplaneGateway string `json:"ctlplaneGateway,omitempty"`
+	// +kubebuilder:validation:Optional
+	// CtlplaneVlan - Vlan for ctlplane network
+	CtlplaneVlan *int `json:"ctlplaneVlan,omitempty"`
 	// +kubebuilder:validation:Optional
 	// UserData - Host User Data
 	UserData *corev1.SecretReference `json:"userData,omitempty"`

api/v1beta1/zz_generated.deepcopy.go

@@ -83,6 +83,13 @@ spec:
                     ctlPlaneIP:
                       description: CtlPlaneIP - Control Plane IP in CIDR notation
                       type: string
+                    ctlplaneGateway:
+                      description: 'CtlplaneGateway - IP of gateway for ctrlplane
+                        network (TODO: acquire this is another manner?)'
+                      type: string
+                    ctlplaneVlan:
+                      description: CtlplaneVlan - Vlan for ctlplane network
+                      type: integer
                     networkData:
                       description: NetworkData - Host Network Data
                       properties:

config/crd/bases/baremetal.openstack.org_openstackbaremetalsets.yaml

@@ -110,11 +110,17 @@ func BaremetalHostProvision(
 		templateParameters := make(map[string]interface{})
 		templateParameters["CtlplaneIpVersion"] = CtlplaneIPVersion
 		templateParameters["CtlplaneIp"] = ipAddr
-		if instance.Spec.CtlplaneVlan != nil {
+		if instance.Spec.BaremetalHosts[hostName].CtlplaneVlan != nil {
+			templateParameters["CtlplaneVlan"] = *instance.Spec.BaremetalHosts[hostName].CtlplaneVlan
+		} else if instance.Spec.CtlplaneVlan != nil {
 			templateParameters["CtlplaneVlan"] = *instance.Spec.CtlplaneVlan
 		}
 		templateParameters["CtlplaneInterface"] = instance.Spec.CtlplaneInterface
-		templateParameters["CtlplaneGateway"] = instance.Spec.CtlplaneGateway
+		if instance.Spec.BaremetalHosts[hostName].CtlplaneGateway != "" {
+			templateParameters["CtlplaneGateway"] = instance.Spec.BaremetalHosts[hostName].CtlplaneGateway
+		} else {
+			templateParameters["CtlplaneGateway"] = instance.Spec.CtlplaneGateway
+		}
 		templateParameters["CtlplaneNetmask"] = net.IP(ipNet.Mask)
 		if len(instance.Spec.BootstrapDNS) > 0 {
 			templateParameters["CtlplaneDns"] = instance.Spec.BootstrapDNS

pkg/openstackbaremetalset/baremetalhost.go

@@ -104,7 +104,6 @@ var _ = Describe("BaremetalSet Test", func() {
 						BmhLabelSelector: nil,
 					},
 				},
-				CtlplaneGateway:                   "",
 				BootstrapDNS:                      nil,
 				DNSSearchDomains:                  nil,
 				OpenStackBaremetalSetTemplateSpec: coreSpec,