Merge pull request #2620 from rackerlabs/ironic-tbn-configmap-generator

feat(ironic): generate TBN ConfigMap from a plain file and default portgroup mode to LACP

Author: cardoe

components/ironic/cm-trait-based-networking.yaml

@@ -7,7 +7,6 @@ resources:
   - ironic-rabbitmq-queue.yaml
   - dnsmasq-pvc.yaml
   - dnsmasq-ss.yaml
-  - cm-trait-based-networking.yaml
   - ironic-ks-user-baremetal.yaml
     # less than ideal addition but necessary so that we can have the ironic.conf.d loading
     # working due to the way the chart hardcodes the config-file parameter which then
@@ -20,6 +19,12 @@ resources:
   - pr-resource-availability.yaml
 
 configMapGenerator:
+  - name: ironic-trait-based-networking
+    files:
+      - trait_based_networking.yaml
+    options:
+      # The conductor's Helm values also reference this ConfigMap by name.
+      disableNameSuffixHash: true
   - name: ironic-oidc-cert-fetch
     files:
       - refresh-oidc-cert.py

components/ironic/kustomization.yaml

@@ -0,0 +1,41 @@
+# Trait Based Networking (TBN) config
+
+# Match each parent VIF's role tag to its NIC category.
+CUSTOM_NETDEV_ROLE_ATTACH:
+  order: 1
+  actions:
+    - action: attach_port
+      filter: port.category == 'outside' && vif.tags == 'outside'
+      max_count: 1
+    - action: attach_port
+      filter: port.category == 'inside' && vif.tags == 'inside'
+      max_count: 1
+
+# Attaches a single category=storage port for a storage VIF. Single-port
+# only for now (A/B grouping is deferred). Require it on a flavor with:
+#   openstack flavor set --property trait:CUSTOM_STORAGE_SWITCH=required <flavor>
+CUSTOM_STORAGE_SWITCH:
+  order: 1
+  actions:
+    - action: attach_port
+      filter: port.category == 'storage' && network.tags == 'storage'
+      max_count: 1
+
+# Default Trait Based Networking (TBN) config.
+# category=network ports auto-attach first attempting any static portgroups
+# then they attempt to bond (portgroup) two ports together and lastly
+# fallback to attaching just a single port.
+CUSTOM_DEFAULT_TBN_TRAIT:
+  actions:
+    - action: attach_portgroup
+      filter: port.is_portgroup && port.category == 'network'
+      max_count: 1
+    # Group 2 free ports with category=network into a new dynamic portgroup,
+    # then attach that portgroup to the network being requested.
+    - action: group_and_attach_ports
+      filter: port.category == 'network' && vif.tags == 'bond-lacp'
+      min_count: 2
+      max_count: 2
+    - action: attach_port
+      filter: port.category == 'network'
+      max_count: 1

components/ironic/trait_based_networking.yaml

@@ -84,6 +84,8 @@ conf:
       enabled_power_interfaces: redfish,idrac-redfish,fake
       enabled_raid_interfaces: redfish,idrac-redfish,agent,no-raid
       enabled_vendor_interfaces: redfish,idrac-redfish,no-vendor
+      # default bonding mode for portgroups (LACP)
+      default_portgroup_mode: 802.3ad
       # the service account belongs to the service project but our nodes
       # will live in the infra domain in the baremetal project so the
       # service account needs to have permissions outside of just the
@@ -105,7 +107,7 @@ conf:
       sync_power_state_interval: 300
       sync_power_state_workers: 20
       # Trait Based Networking (TBN): dynamically portgroup category=network
-      # ports at vif_attach time. See trait-based-networking-cm.yaml for the
+      # ports at vif_attach time. See trait_based_networking.yaml for the
       # trait definitions.
       enable_trait_based_networking: true
       trait_based_networking_config_file: /etc/ironic/trait-based-networking/trait_based_networking.yaml