From 9c04423799da64470856c71be1b4f046afce0003 Mon Sep 17 00:00:00 2001 From: John Fulton Date: Tue, 27 Aug 2024 18:29:06 -0400 Subject: [PATCH] Configure Manila with an NFS network Manila Tempest tests need to connect to the NFS share for Ganesha tests, and they use a special (openstack) network for that [1]. This patch adds an NFS network with VLAN 24 and range 172.21.0.0/24 in reproducers networking-definition.yml. It also adds a multus range for this network so that the Tempest pod can access this network for testing. The NFS network is added to the OCP nodes for the same reason. The networking-env-definition within the ci playbook file is updated to have the nfs network for the github-check rhoso-architecture-validate-hci. TODO: update the Ceph playbook and roles 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 --- .../files/networking-env-definition.yml | 81 +++++++++++++++++++ .../reproducers/networking-definition.yml | 17 ++++ 2 files changed, 98 insertions(+) diff --git a/ci/playbooks/files/networking-env-definition.yml b/ci/playbooks/files/networking-env-definition.yml index 201163757a..86d49cab2c 100644 --- a/ci/playbooks/files/networking-env-definition.yml +++ b/ci/playbooks/files/networking-env-definition.yml @@ -37,6 +37,15 @@ instances: parent_interface: eth1 skip_nm: false vlan_id: 23 + nfs: + interface_name: eth1.24 + ip_v4: 172.21.0.115 + mac_addr: '52:54:00:1b:1c:e5' + mtu: 1500 + network_name: nfs + parent_interface: eth1 + skip_nm: false + vlan_id: 24 ceph-1: hostname: ceph-1 name: ceph-1 @@ -75,6 +84,15 @@ instances: parent_interface: eth1 skip_nm: false vlan_id: 23 + nfs: + interface_name: eth1.24 + ip_v4: 172.21.0.116 + mac_addr: '52:54:00:1b:1c:e6' + mtu: 1500 + network_name: nfs + parent_interface: eth1 + skip_nm: false + vlan_id: 24 ceph-2: hostname: ceph-2 name: ceph-2 @@ -113,6 +131,15 @@ instances: parent_interface: eth1 skip_nm: false vlan_id: 23 + nfs: + interface_name: eth1.24 + ip_v4: 172.21.0.117 + mac_addr: '52:54:00:1b:1c:e7' + mtu: 1500 + network_name: nfs + parent_interface: eth1 + skip_nm: false + vlan_id: 24 compute-0: hostname: compute-0 name: compute-0 @@ -151,6 +178,15 @@ instances: parent_interface: eth1 skip_nm: false vlan_id: 22 + nfs: + interface_name: eth1.24 + ip_v4: 172.21.0.100 + mac_addr: '52:54:00:1b:1c:e8' + mtu: 1500 + network_name: nfs + parent_interface: eth1 + skip_nm: false + vlan_id: 24 compute-1: hostname: compute-1 name: compute-1 @@ -189,6 +225,15 @@ instances: parent_interface: eth1 skip_nm: false vlan_id: 22 + nfs: + interface_name: eth1.24 + ip_v4: 172.21.0.101 + mac_addr: '52:54:00:1b:1c:e9' + mtu: 1500 + network_name: nfs + parent_interface: eth1 + skip_nm: false + vlan_id: 24 compute-2: hostname: compute-2 name: compute-2 @@ -227,6 +272,15 @@ instances: parent_interface: eth1 skip_nm: false vlan_id: 22 + nfs: + interface_name: eth1.24 + ip_v4: 172.21.0.102 + mac_addr: '52:54:00:1b:1c:e0' + mtu: 1500 + network_name: nfs + parent_interface: eth1 + skip_nm: false + vlan_id: 24 controller-0: hostname: controller-0 name: controller-0 @@ -336,6 +390,15 @@ instances: parent_interface: enp6s0 skip_nm: false vlan_id: 22 + nfs: + interface_name: enp6s0.24 + ip_v4: 172.21.0.10 + mac_addr: '52:54:00:18:a1:f6' + mtu: 1500 + network_name: nfs + parent_interface: enp6s0 + skip_nm: false + vlan_id: 24 ocp-master-1: hostname: ocp-master-1 name: ocp-master-1 @@ -374,6 +437,15 @@ instances: parent_interface: enp6s0 skip_nm: false vlan_id: 22 + nfs: + interface_name: enp6s0.24 + ip_v4: 172.21.0.11 + mac_addr: '52:54:00:18:a1:f7' + mtu: 1500 + network_name: nfs + parent_interface: enp6s0 + skip_nm: false + vlan_id: 24 ocp-master-2: hostname: ocp-master-2 name: ocp-master-2 @@ -412,6 +484,15 @@ instances: parent_interface: enp6s0 skip_nm: false vlan_id: 22 + nfs: + interface_name: enp6s0.24 + ip_v4: 172.21.0.12 + mac_addr: '52:54:00:18:a1:f8' + mtu: 1500 + network_name: nfs + parent_interface: enp6s0 + skip_nm: false + vlan_id: 24 networks: ctlplane: dns_v4: diff --git a/scenarios/reproducers/networking-definition.yml b/scenarios/reproducers/networking-definition.yml index 4f0ba0ed26..351e25bec1 100644 --- a/scenarios/reproducers/networking-definition.yml +++ b/scenarios/reproducers/networking-definition.yml @@ -91,6 +91,19 @@ cifmw_networking_definition: end: 250 vlan: 23 mtu: 1500 + nfs: + network: "172.21.0.0/24" + tools: + netconfig: + ranges: + - start: 100 + end: 250 + multus: + ranges: + - start: 30 + end: 70 + vlan: 24 + mtu: 1500 group-templates: ocps: @@ -106,6 +119,8 @@ cifmw_networking_definition: trunk-parent: ctlplane storage: trunk-parent: ctlplane + nfs: + trunk-parent: ctlplane ocp_workers: network-template: range: @@ -127,6 +142,8 @@ cifmw_networking_definition: trunk-parent: ctlplane storagemgmt: trunk-parent: ctlplane + nfs: + trunk-parent: ctlplane cephs: network-template: range: