Remove NetworkConfig override handling

This change removes the CRD level override for network config files. Instead, this allows us to use the Ansible variable directly to set any require network config customizations. Depends-On: openstack-k8s-operators/edpm-ansible#243 Signed-off-by: Brendan Shephard <[email protected]>
openstack-k8s-operators · Sep 12, 2023 · 6fd2cf1 · 6fd2cf1
1 parent 825e933
commit 6fd2cf1
Show file tree

Hide file tree

Showing 17 changed files with 223 additions and 209 deletions.
diff --git a/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -1039,11 +1039,6 @@ spec:
                     items:
                       type: string
                     type: array
-                  networkConfig:
-                    properties:
-                      template:
-                        type: string
-                    type: object
                   networkData:
                     properties:
                       name:
@@ -1833,11 +1828,6 @@ spec:
                           type: string
                         managementNetwork:
                           type: string
-                        networkConfig:
-                          properties:
-                            template:
-                              type: string
-                          type: object
                         networkData:
                           properties:
                             name:

diff --git a/api/v1beta1/common.go b/api/v1beta1/common.go
@@ -18,6 +18,7 @@ package v1beta1
 
 import (
 	"encoding/json"
+	"reflect"
 
 	infranetworkv1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1"
 	"github.com/openstack-k8s-operators/lib-common/modules/storage"
@@ -52,11 +53,6 @@ type NodeSection struct {
 	// +kubebuilder:validation:Optional
 	HostName string `json:"hostName,omitempty"`
 
-	// NetworkConfig - Network configuration details. Contains os-net-config
-	// related properties.
-	// +kubebuilder:validation:Optional
-	NetworkConfig NetworkConfigSection `json:"networkConfig"`
-
 	// Networks - Instance networks
 	// +kubebuilder:validation:Optional
 	Networks []infranetworkv1.IPSetNetwork `json:"networks,omitempty"`
@@ -103,11 +99,6 @@ type NodeTemplate struct {
 	// +kubebuilder:validation:Optional
 	NetworkAttachments []string `json:"networkAttachments,omitempty"`
 
-	// NetworkConfig - Network configuration details. Contains os-net-config
-	// related properties.
-	// +kubebuilder:validation:Optional
-	NetworkConfig NetworkConfigSection `json:"networkConfig,omitempty"`
-
 	// Networks - Instance networks
 	// +kubebuilder:validation:Optional
 	Networks []infranetworkv1.IPSetNetwork `json:"networks,omitempty"`
@@ -153,13 +144,26 @@ type DeployStrategySection struct {
 	AnsibleSkipTags string `json:"ansibleSkipTags,omitempty"`
 }
 
-// NetworkConfigSection is a specification of the Network configuration details
-type NetworkConfigSection struct {
-
-	// Template - Contains a Ansible j2 nic config template to use when applying node
-	// network configuration
-	// +kubebuilder:validation:Optional
-	Template string `json:"template,omitempty" yaml:"template,omitempty"`
+// UniqueSpecFields - the array of fields that must be unique between role and nodes
+var UniqueSpecFields = []string{"NetworkAttachments"}
+
+// AssertUniquenessBetween - compare specs for uniqueness
+func AssertUniquenessBetween(spec interface{}, otherSpec interface{}, suffix string) []string {
+	vSpec := reflect.ValueOf(spec)
+	vOtherSpec := reflect.ValueOf(otherSpec)
+
+	var errorMsgs []string
+	for _, field := range UniqueSpecFields {
+		value := vSpec.FieldByName(field)
+		otherValue := vOtherSpec.FieldByName(field)
+		if value.IsZero() || otherValue.IsZero() {
+			continue
+		}
+		if !reflect.DeepEqual(value.Interface(), otherValue.Interface()) {
+			errorMsgs = append(errorMsgs, field+" mismatch between "+suffix)
+		}
+	}
+	return errorMsgs
 }
 
 // AnsibleEESpec is a specification of the ansible EE attributes

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -1039,11 +1039,6 @@ spec:
                     items:
                       type: string
                     type: array
-                  networkConfig:
-                    properties:
-                      template:
-                        type: string
-                    type: object
                   networkData:
                     properties:
                       name:
@@ -1833,11 +1828,6 @@ spec:
                           type: string
                         managementNetwork:
                           type: string
-                        networkConfig:
-                          properties:
-                            template:
-                              type: string
-                          type: object
                         networkData:
                           properties:
                             name:

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml
@@ -48,7 +48,39 @@ spec:
          # Default nic config template for a EDPM compute node
          # These vars are edpm_network_config role vars
          edpm_network_config_hide_sensitive_logs: false
-         edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
+         edpm_network_config_template: |
+              ---
+              {% set mtu_list = [ctlplane_mtu] %}
+              {% for network in role_networks %}
+              {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
+              {%- endfor %}
+              {% set min_viable_mtu = mtu_list | max %}
+              network_config:
+              - type: ovs_bridge
+                name: {{ neutron_physical_bridge_name }}
+                mtu: {{ min_viable_mtu }}
+                use_dhcp: false
+                dns_servers: {{ ctlplane_dns_nameservers }}
+                domain: {{ dns_search_domains }}
+                addresses:
+                - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
+                routes: {{ ctlplane_host_routes }}
+                members:
+                - type: interface
+                  name: nic1
+                  mtu: {{ min_viable_mtu }}
+                  # force the MAC address of the bridge to this interface
+                  primary: true
+              {% for network in role_networks %}
+                - type: vlan
+                  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+                  vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
+                  addresses:
+                  - ip_netmask:
+                      {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+                  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
+              {% endfor %}
+
          # These vars are for the network config templates themselves and are
          # considered EDPM network defaults.
          neutron_physical_bridge_name: br-ex

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal.yaml
@@ -67,7 +67,38 @@ spec:
           # edpm_network_config
           # Default nic config template for a EDPM compute node
           # These vars are edpm_network_config role vars
-          edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
+          edpm_network_config_template: |
+               ---
+               {% set mtu_list = [ctlplane_mtu] %}
+               {% for network in role_networks %}
+               {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
+               {%- endfor %}
+               {% set min_viable_mtu = mtu_list | max %}
+               network_config:
+               - type: ovs_bridge
+                 name: {{ neutron_physical_bridge_name }}
+                 mtu: {{ min_viable_mtu }}
+                 use_dhcp: false
+                 dns_servers: {{ ctlplane_dns_nameservers }}
+                 domain: {{ dns_search_domains }}
+                 addresses:
+                 - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
+                 routes: {{ ctlplane_host_routes }}
+                 members:
+                 - type: interface
+                   name: nic1
+                   mtu: {{ min_viable_mtu }}
+                   # force the MAC address of the bridge to this interface
+                   primary: true
+               {% for network in role_networks %}
+                 - type: vlan
+                   mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+                   vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
+                   addresses:
+                   - ip_netmask:
+                       {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+                   routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
+               {% endfor %}
           edpm_network_config_hide_sensitive_logs: false
 
           # These vars are for the network config templates themselves and are

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml
@@ -56,7 +56,38 @@ spec:
          # Default nic config template for a EDPM compute node
          # These vars are edpm_network_config role vars
          edpm_network_config_hide_sensitive_logs: false
-         edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
+         edpm_network_config_template: |
+              ---
+              {% set mtu_list = [ctlplane_mtu] %}
+              {% for network in role_networks %}
+              {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
+              {%- endfor %}
+              {% set min_viable_mtu = mtu_list | max %}
+              network_config:
+              - type: ovs_bridge
+                name: {{ neutron_physical_bridge_name }}
+                mtu: {{ min_viable_mtu }}
+                use_dhcp: false
+                dns_servers: {{ ctlplane_dns_nameservers }}
+                domain: {{ dns_search_domains }}
+                addresses:
+                - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
+                routes: {{ ctlplane_host_routes }}
+                members:
+                - type: interface
+                  name: nic1
+                  mtu: {{ min_viable_mtu }}
+                  # force the MAC address of the bridge to this interface
+                  primary: true
+              {% for network in role_networks %}
+                - type: vlan
+                  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+                  vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
+                  addresses:
+                  - ip_netmask:
+                      {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+                  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
+              {% endfor %}
          # These vars are for the network config templates themselves and are
          # considered EDPM network defaults.
          neutron_physical_bridge_name: br-ex

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_ceph.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_ceph.yaml
@@ -2,7 +2,7 @@
 apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneNodeSet
 metadata:
-  name: openstack-edpm-ceph
+  name: openstack-edpm
 spec:
   env:
     - name: ANSIBLE_FORCE_COLOR
@@ -67,7 +67,39 @@ spec:
         # edpm_network_config
         # Default nic config template for a EDPM compute node
         # These vars are edpm_network_config role vars
-        edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
+        edpm_network_config_template: |
+             ---
+             {% set mtu_list = [ctlplane_mtu] %}
+             {% for network in role_networks %}
+             {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
+             {%- endfor %}
+             {% set min_viable_mtu = mtu_list | max %}
+             network_config:
+             - type: ovs_bridge
+               name: {{ neutron_physical_bridge_name }}
+               mtu: {{ min_viable_mtu }}
+               use_dhcp: false
+               dns_servers: {{ ctlplane_dns_nameservers }}
+               domain: {{ dns_search_domains }}
+               addresses:
+               - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
+               routes: {{ ctlplane_host_routes }}
+               members:
+               - type: interface
+                 name: nic1
+                 mtu: {{ min_viable_mtu }}
+                 # force the MAC address of the bridge to this interface
+                 primary: true
+             {% for network in role_networks %}
+               - type: vlan
+                 mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+                 vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
+                 addresses:
+                 - ip_netmask:
+                     {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+                 routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
+             {% endfor %}
+
         edpm_network_config_hide_sensitive_logs: false
         #
         # These vars are for the network config templates themselves and are

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_customnetworks.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_customnetworks.yaml
@@ -49,7 +49,38 @@ spec:
         # edpm_network_config
         # Default nic config template for a EDPM compute node
         # These vars are edpm_network_config role vars
-        edpm_network_config_template: /runner/network/nic-config-template
+        edpm_network_config_template: |
+             ---
+             {% set mtu_list = [ctlplane_mtu] %}
+             {% for network in role_networks %}
+             {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
+             {%- endfor %}
+             {% set min_viable_mtu = mtu_list | max %}
+             network_config:
+             - type: ovs_bridge
+               name: {{ neutron_physical_bridge_name }}
+               mtu: {{ min_viable_mtu }}
+               use_dhcp: false
+               dns_servers: {{ ctlplane_dns_nameservers }}
+               domain: {{ dns_search_domains }}
+               addresses:
+               - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
+               routes: {{ ctlplane_host_routes }}
+               members:
+               - type: interface
+                 name: nic1
+                 mtu: {{ min_viable_mtu }}
+                 # force the MAC address of the bridge to this interface
+                 primary: true
+             {% for network in role_networks %}
+               - type: vlan
+                 mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+                 vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
+                 addresses:
+                 - ip_netmask:
+                     {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+                 routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
+             {% endfor %}
         edpm_network_config_hide_sensitive_logs: false
         edpm_network_config_update: false
         #

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml
@@ -86,6 +86,38 @@ spec:
          # edpm_network_config
          # Default nic config template for a EDPM compute node
          # These vars are edpm_network_config role vars
+         edpm_network_config_template: |
+              ---
+              {% set mtu_list = [ctlplane_mtu] %}
+              {% for network in role_networks %}
+              {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
+              {%- endfor %}
+              {% set min_viable_mtu = mtu_list | max %}
+              network_config:
+              - type: ovs_bridge
+                name: {{ neutron_physical_bridge_name }}
+                mtu: {{ min_viable_mtu }}
+                use_dhcp: false
+                dns_servers: {{ ctlplane_dns_nameservers }}
+                domain: {{ dns_search_domains }}
+                addresses:
+                - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
+                routes: {{ ctlplane_host_routes }}
+                members:
+                - type: interface
+                  name: nic1
+                  mtu: {{ min_viable_mtu }}
+                  # force the MAC address of the bridge to this interface
+                  primary: true
+              {% for network in role_networks %}
+                - type: vlan
+                  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+                  vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
+                  addresses:
+                  - ip_netmask:
+                      {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+                  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
+              {% endfor %}
          edpm_network_config_hide_sensitive_logs: false
          # These vars are for the network config templates themselves and are
          # considered EDPM network defaults.