Add Storage NFS network for Manila to uni04delta

Manila tests need to connect to the share for both cephfs and ganesha tests, and they use a special (openstack) network for that [1]. This patch adds the NFS storage network (storagenfs) with VLAN 24 and range 172.21.0.0/24 in uni04delta. The storagenfs network is connected to ceph and compute EDPM nodes. A NNCP, NAD, L2Advertisement and IPAddressPool are defined for the NFS network so that a pod in k8s can connect to it; such as the tempest pod which will perform storage tests. In order to make these changes uni04delta now keeps its own copy of the nncp and networking directories since they differ (by the new network) from the generic ones in the lib directory. TODO: update Manila CRDs to use this network. [1] https://opendev.org/openstack/manila-tempest-plugin/src/branch/master/manila_tempest_tests/config.py#L99 Jira: https://issues.redhat.com/browse/OSPRH-7417 Signed-off-by: John Fulton <[email protected]>
openstack-k8s-operators · Aug 29, 2024 · 2e34078 · 2e34078
1 parent 449b690
commit 2e34078
Show file tree

Hide file tree

Showing 12 changed files with 760 additions and 1 deletion.
diff --git a/dt/uni04delta/nncp/kustomization.yaml b/dt/uni04delta/nncp/kustomization.yaml
diff --git a/dt/uni04delta/nncp/ocp_node_template.yaml b/dt/uni04delta/nncp/ocp_node_template.yaml
@@ -0,0 +1,108 @@
+---
+apiVersion: nmstate.io/v1
+kind: NodeNetworkConfigurationPolicy
+metadata:
+  name: _ignored_
+spec:
+  desiredState:
+    dns-resolver:
+      config:
+        search: []
+        server: []
+    routes:
+      config: []
+    route-rules:
+      config: []
+    interfaces:
+      - description: internalapi vlan interface
+        ipv4:
+          address:
+            - ip: _replaced_
+              prefix-length: _replaced_
+          enabled: true
+          dhcp: false
+        ipv6:
+          enabled: false
+        name: internalapi
+        state: up
+        type: vlan
+        vlan:
+          base-iface: _replaced_
+          id: _replaced_
+        mtu: 1500
+      - description: storage vlan interface
+        ipv4:
+          address:
+            - ip: _replaced_
+              prefix-length: _replaced_
+          enabled: true
+          dhcp: false
+        ipv6:
+          enabled: false
+        name: storage
+        state: up
+        type: vlan
+        vlan:
+          base-iface: _replaced_
+          id: _replaced_
+        mtu: 1500
+      - description: tenant vlan interface
+        ipv4:
+          address:
+            - ip: _replaced_
+              prefix-length: _replaced_
+          enabled: true
+          dhcp: false
+        ipv6:
+          enabled: false
+        name: tenant
+        state: up
+        type: vlan
+        vlan:
+          base-iface: _replaced_
+          id: _replaced_
+        mtu: 1500
+      - description: storagenfs vlan interface
+        ipv4:
+          address:
+            - ip: _replaced_
+              prefix-length: _replaced_
+          enabled: true
+          dhcp: false
+        ipv6:
+          enabled: false
+        name: storagenfs
+        state: up
+        type: vlan
+        vlan:
+          base-iface: _replaced_
+          id: _replaced_
+        mtu: 1500
+      - description: ctlplane interface
+        name: _replaced_
+        state: up
+        type: ethernet
+        mtu: 1500
+      - description: linux-bridge over ctlplane interface
+        ipv4:
+          address:
+            - ip: _replaced_
+              prefix-length: _replaced_
+          enabled: true
+          dhcp: false
+        ipv6:
+          enabled: false
+        name: _replaced_
+        state: up
+        type: linux-bridge
+        bridge:
+          options:
+            stp:
+              enabled: false
+          port:
+            - name: _replaced_
+              vlan: {}
+        mtu: 1500
+  nodeSelector:
+    kubernetes.io/hostname: _replaced_
+    node-role.kubernetes.io/worker: ""
diff --git a/dt/uni04delta/nncp/ocp_nodes_nncp.yaml b/dt/uni04delta/nncp/ocp_nodes_nncp.yaml
@@ -0,0 +1,21 @@
+---
+apiVersion: nmstate.io/v1
+kind: NodeNetworkConfigurationPolicy
+metadata:
+  name: node-0
+  labels:
+    osp/nncm-config-type: standard
+---
+apiVersion: nmstate.io/v1
+kind: NodeNetworkConfigurationPolicy
+metadata:
+  name: node-1
+  labels:
+    osp/nncm-config-type: standard
+---
+apiVersion: nmstate.io/v1
+kind: NodeNetworkConfigurationPolicy
+metadata:
+  name: node-2
+  labels:
+    osp/nncm-config-type: standard
diff --git a/examples/dt/uni04delta/control-plane/nncp/kustomization.yaml b/examples/dt/uni04delta/control-plane/nncp/kustomization.yaml
@@ -17,7 +17,7 @@ transformers:
           create: true
 
 components:
-  - ../../../../../lib/nncp
+  - ../../../../../dt/uni04delta/nncp
 
 resources:
   - values.yaml
diff --git a/examples/dt/uni04delta/control-plane/nncp/values.yaml b/examples/dt/uni04delta/control-plane/nncp/values.yaml
@@ -16,18 +16,21 @@ data:
     tenant_ip: 172.19.0.5
     ctlplane_ip: 192.168.122.10
     storage_ip: 172.18.0.5
+    storagenfs_ip: 172.21.0.5
   node_1:
     name: master-1
     internalapi_ip: 172.17.0.6
     tenant_ip: 172.19.0.6
     ctlplane_ip: 192.168.122.11
     storage_ip: 172.18.0.6
+    storagenfs_ip: 172.21.0.6
   node_2:
     name: master-2
     internalapi_ip: 172.17.0.7
     tenant_ip: 172.19.0.7
     ctlplane_ip: 192.168.122.12
     storage_ip: 172.18.0.7
+    storagenfs_ip: 172.21.0.7
 
   ctlplane:
     dnsDomain: ctlplane.example.com
@@ -127,6 +130,37 @@ data:
         }
       }
 
+  storagenfs:
+    dnsDomain: storagenfs.example.com
+    subnets:
+      - allocationRanges:
+          - end: 172.21.0.250
+            start: 172.21.0.100
+        cidr: 172.21.0.0/24
+        gateway: 172.21.0.1
+        name: subnet1
+        vlan: 24
+    mtu: 1500
+    prefix-length: 24
+    iface: storagenfs
+    vlan: 24
+    base_iface: enp6s0
+    lb_addresses:
+      - 172.21.0.80-172.21.0.90
+    net-attach-def: |
+      {
+        "cniVersion": "0.3.1",
+        "name": "storagenfs",
+        "type": "macvlan",
+        "master": "storagenfs",
+        "ipam": {
+          "type": "whereabouts",
+          "range": "172.21.0.0/24",
+          "range_start": "172.21.0.100",
+          "range_end": "172.21.0.250"
+        }
+      }
+
   storagemgmt:
     dnsDomain: storagemgmt.example.com
     subnets:

diff --git a/examples/dt/uni04delta/edpm-pre-ceph/nodeset/values.yaml b/examples/dt/uni04delta/edpm-pre-ceph/nodeset/values.yaml
@@ -96,6 +96,8 @@ data:
         subnetName: subnet1
       - name: storagemgmt
         subnetName: subnet1
+      - name: storagenfs
+        subnetName: subnet1
 
     nodes:
       edpm-ceph-0:
@@ -111,6 +113,8 @@ data:
             subnetName: subnet1
           - name: storageMgmt
             subnetName: subnet1
+          - name: storagenfs
+            subnetName: subnet1
       edpm-ceph-1:
         ansible:
           ansibleHost: 192.168.122.106
@@ -124,6 +128,8 @@ data:
             subnetName: subnet1
           - name: storageMgmt
             subnetName: subnet1
+          - name: storagenfs
+            subnetName: subnet1
       edpm-ceph-2:
         ansible:
           ansibleHost: 192.168.122.107
@@ -137,6 +143,8 @@ data:
             subnetName: subnet1
           - name: storageMgmt
             subnetName: subnet1
+          - name: storagenfs
+            subnetName: subnet1
 
     services:
       - bootstrap

diff --git a/examples/dt/uni04delta/values.yaml b/examples/dt/uni04delta/values.yaml
@@ -102,6 +102,8 @@ data:
         subnetName: subnet1
       - name: storagemgmt
         subnetName: subnet1
+      - name: storagenfs
+        subnetName: subnet1
 
     nodes:
       edpm-compute-0:
@@ -119,6 +121,8 @@ data:
             subnetName: subnet1
           - name: tenant
             subnetName: subnet1
+          - name: storagenfs
+            subnetName: subnet1
       edpm-compute-1:
         ansible:
           ansibleHost: 192.168.122.101
@@ -134,6 +138,8 @@ data:
             subnetName: subnet1
           - name: tenant
             subnetName: subnet1
+          - name: storagenfs
+            subnetName: subnet1
 
     services:
       - bootstrap

diff --git a/lib/networking/metallb/kustomization.yaml b/lib/networking/metallb/kustomization.yaml
@@ -111,6 +111,17 @@ replacements:
           name: storage
         fieldPaths:
           - spec.addresses
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagenfs.lb_addresses
+    targets:
+      - select:
+          group: metallb.io
+          kind: IPAddressPool
+          name: storagenfs
+        fieldPaths:
+          - spec.addresses
 
   # Loadbalancer interfaces
   - source:
@@ -157,3 +168,14 @@ replacements:
           name: internalapi
         fieldPaths:
           - spec.interfaces.0
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagenfs.iface
+    targets:
+      - select:
+          group: metallb.io
+          kind: L2Advertisement
+          name: storagenfs
+        fieldPaths:
+          - spec.interfaces.0
diff --git a/lib/networking/metallb/metallb_l2advertisement.yaml b/lib/networking/metallb/metallb_l2advertisement.yaml
@@ -46,3 +46,14 @@ spec:
     - tenant
   interfaces:
     - _replaced_
+---
+apiVersion: metallb.io/v1beta1
+kind: L2Advertisement
+metadata:
+  name: storagenfs
+  namespace: metallb-system
+spec:
+  ipAddressPools:
+    - storagenfs
+  interfaces:
+    - _replaced_
diff --git a/lib/networking/metallb/ocp_ip_pools.yaml b/lib/networking/metallb/ocp_ip_pools.yaml
@@ -30,3 +30,11 @@ metadata:
   name: tenant
   labels:
     osp/lb-addresses-type: standard
+---
+apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
+metadata:
+  namespace: metallb-system
+  name: storagenfs
+  labels:
+    osp/lb-addresses-type: standard
diff --git a/lib/networking/nad/kustomization.yaml b/lib/networking/nad/kustomization.yaml
@@ -63,3 +63,13 @@ replacements:
           name: datacentre
         fieldPaths:
           - spec.config
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagenfs.net-attach-def
+    targets:
+      - select:
+          kind: NetworkAttachmentDefinition
+          name: storagenfs
+        fieldPaths:
+          - spec.config
diff --git a/lib/networking/nad/ocp_networks_netattach.yaml b/lib/networking/nad/ocp_networks_netattach.yaml
@@ -38,3 +38,11 @@ metadata:
   labels:
     osp/net: datacentre
     osp/net-attach-def-type: standard
+---
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  name: storagenfs
+  labels:
+    osp/net: storagenfs
+    osp/net-attach-def-type: standard