Merge pull request #626 from ashu-011/add_smgmt_nad

softwarefactory-project-zuul[bot] · web-flow · commit 331e9201b056 · 2025-10-06T14:47:42.000Z
Add storagemgmt NAD to uni05epsilon DT

This commit adds storagemgmt NetworkAttachments Definition to uni05epsilon DT

Reviewed-by: Andrew Bays &lt;andrew.bays@gmail.com&gt;
Reviewed-by: Ashish Gupta &lt;ashigupt@redhat.com&gt;
Reviewed-by: John Fulton &lt;johfulto@redhat.com&gt;
diff --git a/automation/net-env/uni05epsilon-adoption.yaml b/automation/net-env/uni05epsilon-adoption.yaml
@@ -235,6 +235,17 @@ instances:
         prefix_length_v4: 24
         skip_nm: false
         vlan_id: 122
+      storagemgmt:
+        interface_name: enp6s0.123
+        ip_v4: 172.20.0.10
+        mac_addr: "52:54:00:28:4f:f1"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: storagemgmt
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 123
   ocp-1:
     hostname: osasinfra-master-1
     name: ocp-1
@@ -292,6 +303,17 @@ instances:
         prefix_length_v4: 24
         skip_nm: false
         vlan_id: 122
+      storagemgmt:
+        interface_name: enp6s0.123
+        ip_v4: 172.20.0.11
+        mac_addr: "52:54:00:14:39:b6"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: storagemgmt
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 123
   ocp-2:
     hostname: osasinfra-master-2
     name: ocp-2
@@ -349,6 +371,17 @@ instances:
         prefix_length_v4: 24
         skip_nm: false
         vlan_id: 122
+      storagemgmt:
+        interface_name: enp6s0.123
+        ip_v4: 172.20.0.12
+        mac_addr: "52:54:00:de:3d:96"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: storagemgmt
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 123
   networker-0:
     hostname: networker-0
     name: networker-0
@@ -447,6 +480,15 @@ instances:
         parent_interface: eth1
         skip_nm: false
         vlan_id: 22
+      storagemgmt:
+        interface_name: eth1.123
+        ip_v4: 172.20.0.100
+        mac_addr: "52:54:00:17:05:44"
+        mtu: 1500
+        network_name: storagemgmt
+        parent_interface: eth1
+        skip_nm: false
+        vlan_id: 123
   compute-1:
     hostname: compute-1
     name: compute-1
@@ -485,6 +527,15 @@ instances:
         parent_interface: eth1
         skip_nm: false
         vlan_id: 22
+      storagemgmt:
+        interface_name: eth1.123
+        ip_v4: 172.20.0.101
+        mac_addr: "52:54:00:17:05:45"
+        mtu: 1500
+        network_name: storagemgmt
+        parent_interface: eth1
+        skip_nm: false
+        vlan_id: 123
   compute-2:
     hostname: compute-2
     name: compute-2
@@ -523,6 +574,15 @@ instances:
         parent_interface: eth1
         skip_nm: false
         vlan_id: 22
+      storagemgmt:
+        interface_name: eth1.123
+        ip_v4: 172.20.0.102
+        mac_addr: "52:54:00:17:05:46"
+        mtu: 1500
+        network_name: storagemgmt
+        parent_interface: eth1
+        skip_nm: false
+        vlan_id: 123
 networks:
   ctlplane:
     dns_v4:
@@ -674,6 +734,22 @@ networks:
     network_v4: 172.20.0.0/24
     search_domain: storagemgmt.example.com
     tools:
+      metallb:
+        ipv4_ranges:
+          - end: 172.20.0.90
+            end_host: 90
+            length: 11
+            start: 172.20.0.80
+            start_host: 80
+        ipv6_ranges: []
+      multus:
+        ipv4_ranges:
+          - end: 172.20.0.70
+            end_host: 70
+            length: 41
+            start: 172.20.0.30
+            start_host: 30
+        ipv6_ranges: []
       netconfig:
         ipv4_ranges:
           - end: 172.20.0.250
diff --git a/automation/net-env/uni05epsilon.yaml b/automation/net-env/uni05epsilon.yaml
@@ -235,6 +235,17 @@ instances:
         prefix_length_v4: 24
         skip_nm: false
         vlan_id: 122
+      storagemgmt:
+        interface_name: enp6s0.123
+        ip_v4: 172.20.0.10
+        mac_addr: "52:54:00:28:4f:f1"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: storagemgmt
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 123
   ocp-1:
     hostname: osasinfra-master-1
     name: ocp-1
@@ -292,6 +303,17 @@ instances:
         prefix_length_v4: 24
         skip_nm: false
         vlan_id: 122
+      storagemgmt:
+        interface_name: enp6s0.123
+        ip_v4: 172.20.0.11
+        mac_addr: "52:54:00:14:39:b6"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: storagemgmt
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 123
   ocp-2:
     hostname: osasinfra-master-2
     name: ocp-2
@@ -349,6 +371,17 @@ instances:
         prefix_length_v4: 24
         skip_nm: false
         vlan_id: 122
+      storagemgmt:
+        interface_name: enp6s0.123
+        ip_v4: 172.20.0.12
+        mac_addr: "52:54:00:de:3d:96"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: storagemgmt
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 123
   networker-0:
     hostname: networker-0
     name: networker-0
@@ -447,6 +480,15 @@ instances:
         parent_interface: eth1
         skip_nm: false
         vlan_id: 22
+      storagemgmt:
+        interface_name: eth1.123
+        ip_v4: 172.20.0.100
+        mac_addr: "52:54:00:17:05:44"
+        mtu: 1500
+        network_name: storagemgmt
+        parent_interface: eth1
+        skip_nm: false
+        vlan_id: 123
   compute-1:
     hostname: compute-1
     name: compute-1
@@ -485,6 +527,15 @@ instances:
         parent_interface: eth1
         skip_nm: false
         vlan_id: 22
+      storagemgmt:
+        interface_name: eth1.123
+        ip_v4: 172.20.0.101
+        mac_addr: "52:54:00:17:05:45"
+        mtu: 1500
+        network_name: storagemgmt
+        parent_interface: eth1
+        skip_nm: false
+        vlan_id: 123
   compute-2:
     hostname: compute-2
     name: compute-2
@@ -523,6 +574,15 @@ instances:
         parent_interface: eth1
         skip_nm: false
         vlan_id: 22
+      storagemgmt:
+        interface_name: eth1.123
+        ip_v4: 172.20.0.102
+        mac_addr: "52:54:00:17:05:46"
+        mtu: 1500
+        network_name: storagemgmt
+        parent_interface: eth1
+        skip_nm: false
+        vlan_id: 123
 networks:
   ctlplane:
     dns_v4:
@@ -674,6 +734,22 @@ networks:
     network_v4: 172.20.0.0/24
     search_domain: storagemgmt.example.com
     tools:
+      metallb:
+        ipv4_ranges:
+          - end: 172.20.0.90
+            end_host: 90
+            length: 11
+            start: 172.20.0.80
+            start_host: 80
+        ipv6_ranges: []
+      multus:
+        ipv4_ranges:
+          - end: 172.20.0.70
+            end_host: 70
+            length: 41
+            start: 172.20.0.30
+            start_host: 30
+        ipv6_ranges: []
       netconfig:
         ipv4_ranges:
           - end: 172.20.0.250
diff --git a/dt/uni05epsilon/networking/kustomization.yaml b/dt/uni05epsilon/networking/kustomization.yaml
@@ -21,6 +21,9 @@ components:
   - ../../../lib/networking/netconfig
   - ../../../lib/networking/nad
 
+resources:
+  - ocp-networks-storagemgmt-netattach.yaml
+
 patches:
   #
   # The storagemgmt network template needed for CephHCI
@@ -72,3 +75,14 @@ replacements:
           kind: NetConfig
         fieldPaths:
           - spec.networks.[name=storagemgmt].subnets
+
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagemgmt.net-attach-def
+    targets:
+      - select:
+          kind: NetworkAttachmentDefinition
+          name: storagemgmt
+        fieldPaths:
+          - spec.config
diff --git a/dt/uni05epsilon/networking/ocp-networks-storagemgmt-netattach.yaml b/dt/uni05epsilon/networking/ocp-networks-storagemgmt-netattach.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  name: storagemgmt
+  labels:
+    osp/net: storagemgmt
+    osp/net-attach-def-type: standard
diff --git a/examples/dt/uni05epsilon/control-plane/networking/nncp/kustomization.yaml b/examples/dt/uni05epsilon/control-plane/networking/nncp/kustomization.yaml
@@ -21,3 +21,109 @@ components:
 
 resources:
   - values.yaml
+
+patches:
+  - target:
+      kind: NodeNetworkConfigurationPolicy
+      name: "master-.*"
+    patch: |-
+      - op: add
+        path: /spec/desiredState/interfaces/-
+        value:
+          description: storagemgmt vlan host interface
+          name: storagemgmt
+          state: up
+          type: vlan
+          mtu: _mtu_replaced_
+          ipv4:
+            address:
+            - ip: _ip_replaced_
+              prefix-length: _prefix_replaced_
+            dhcp: false
+            enabled: true
+          ipv6:
+            enabled: false
+          vlan:
+            base-iface: _base_iface_replaced_
+            id: _vlan_id_replaced_
+
+replacements:
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.node_0.storagemgmt_ip
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: master-0
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=storagemgmt].ipv4.address.0.ip
+
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.node_1.storagemgmt_ip
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: master-1
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=storagemgmt].ipv4.address.0.ip
+
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.node_2.storagemgmt_ip
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: master-2
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=storagemgmt].ipv4.address.0.ip
+
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagemgmt.base_iface
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=storagemgmt].vlan.base-iface
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagemgmt.vlan
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=storagemgmt].vlan.id
+        options:
+          create: true
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagemgmt.mtu
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=storagemgmt].mtu
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagemgmt.prefix-length
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=storagemgmt].ipv4.address.0.prefix-length
+        options:
+          create: true
diff --git a/examples/dt/uni05epsilon/control-plane/networking/nncp/values.yaml b/examples/dt/uni05epsilon/control-plane/networking/nncp/values.yaml
