Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add NFS network for Manila to uni04delta #376

Closed
wants to merge 1 commit into from

Conversation

fultonj
Copy link
Contributor

@fultonj fultonj commented Aug 27, 2024

Manila Tempest tests need to connect to the share for Ganesha via a special (openstack) network [1].

This patch adds the NFS storage network with VLAN 24 and range 172.21.0.0/24 in uni04delta. The NFS 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 the storage tests and the manilaShares pod(s).

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.

[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
Depends-On: openstack-k8s-operators/ci-framework#2273

Copy link

openshift-ci bot commented Aug 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fultonj

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

fultonj added a commit to fultonj/ci-framework that referenced this pull request Aug 27, 2024
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 storage NFS network (storagenfs)
with VLAN 24 and range 172.21.0.0/24 in the 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 storage network is added to the
OCP nodes for the same reason.

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
Depends-On: openstack-k8s-operators/architecture#376

Signed-off-by: John Fulton <[email protected]>
Copy link
Contributor

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/ef7e740aba7340e88030b864e7289414

✔️ noop SUCCESS in 0s
rhoso-architecture-validate-bgp FAILURE in 3m 57s
rhoso-architecture-validate-bgp_dt01 FAILURE in 4m 03s
rhoso-architecture-validate-hci FAILURE in 4m 17s
rhoso-architecture-validate-nfv-ovs-dpdk-sriov-hci FAILURE in 4m 01s
rhoso-architecture-validate-osasinfra FAILURE in 4m 21s
rhoso-architecture-validate-ovs-dpdk FAILURE in 4m 03s
rhoso-architecture-validate-ovs-dpdk-sriov FAILURE in 4m 01s
rhoso-architecture-validate-pidone FAILURE in 4m 19s
rhoso-architecture-validate-sriov FAILURE in 3m 54s
rhoso-architecture-validate-uni01alpha FAILURE in 3m 54s
rhoso-architecture-validate-uni02beta FAILURE in 4m 22s
rhoso-architecture-validate-uni04delta FAILURE in 3m 56s
rhoso-architecture-validate-uni04delta-ipv6 FAILURE in 4m 28s
rhoso-architecture-validate-uni05epsilon FAILURE in 4m 11s
rhoso-architecture-validate-uni06zeta FAILURE in 4m 16s
rhoso-architecture-validate-uni07eta FAILURE in 4m 11s

Copy link
Contributor

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/6d60f7226a9a40d885eb7e5af28ed461

✔️ noop SUCCESS in 0s
rhoso-architecture-validate-bgp FAILURE in 3m 10s
rhoso-architecture-validate-bgp_dt01 FAILURE in 4m 04s
rhoso-architecture-validate-hci FAILURE in 4m 02s
rhoso-architecture-validate-nfv-ovs-dpdk-sriov-hci FAILURE in 4m 10s
rhoso-architecture-validate-osasinfra FAILURE in 3m 59s
rhoso-architecture-validate-ovs-dpdk FAILURE in 4m 02s
rhoso-architecture-validate-ovs-dpdk-sriov FAILURE in 3m 59s
rhoso-architecture-validate-pidone FAILURE in 3m 55s
rhoso-architecture-validate-sriov FAILURE in 4m 05s
rhoso-architecture-validate-uni01alpha FAILURE in 3m 48s
rhoso-architecture-validate-uni02beta FAILURE in 4m 09s
rhoso-architecture-validate-uni04delta FAILURE in 3m 52s
rhoso-architecture-validate-uni04delta-ipv6 FAILURE in 4m 14s
rhoso-architecture-validate-uni05epsilon FAILURE in 4m 08s
rhoso-architecture-validate-uni06zeta FAILURE in 3m 56s
rhoso-architecture-validate-uni07eta FAILURE in 3m 54s

@fultonj
Copy link
Contributor Author

fultonj commented Aug 27, 2024

When I run the kustomize commands documented at:

https://github.com/openstack-k8s-operators/architecture/tree/main/examples/va/hci#stages

They produce the desired k8s manifests which are the same but have new storagenfs network:

https://paste.openstack.org/show/bM6mLzUtCv0OFpjgBV4r

Though, I do see VLAN 21 where 24 was desired on line 80 above so I need to fix that next.

Also, maybe I need to update the CI tests to work with the change?

@fmount
Copy link
Contributor

fmount commented Aug 28, 2024

@fultonj in theory this additional network is required in uni-delta (external ceph + manila w/ ganesha).
Should we just add it in that particular scenario or is your plan to have it to both (uni-gamma/va1 - uni-delta).

@fultonj
Copy link
Contributor Author

fultonj commented Aug 28, 2024

@fultonj in theory this additional network is required in uni-delta (external ceph + manila w/ ganesha). Should we just add it in that particular scenario or is your plan to have it to both (uni-gamma/va1 - uni-delta).

OK, thanks. I'll move it to uni-delta

Copy link
Contributor

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/5efc61e7312f47139fde6b070c5968a1

✔️ noop SUCCESS in 0s
rhoso-architecture-validate-bgp FAILURE in 4m 02s
rhoso-architecture-validate-bgp_dt01 FAILURE in 4m 08s
rhoso-architecture-validate-hci FAILURE in 4m 34s
rhoso-architecture-validate-nfv-ovs-dpdk-sriov-hci FAILURE in 4m 31s
rhoso-architecture-validate-osasinfra FAILURE in 4m 17s
rhoso-architecture-validate-ovs-dpdk FAILURE in 4m 02s
rhoso-architecture-validate-ovs-dpdk-sriov FAILURE in 4m 12s
rhoso-architecture-validate-pidone FAILURE in 4m 14s
rhoso-architecture-validate-sriov FAILURE in 4m 35s
rhoso-architecture-validate-uni01alpha FAILURE in 4m 31s
rhoso-architecture-validate-uni02beta FAILURE in 4m 37s
rhoso-architecture-validate-uni04delta FAILURE in 4m 07s
rhoso-architecture-validate-uni04delta-ipv6 FAILURE in 4m 47s
rhoso-architecture-validate-uni05epsilon FAILURE in 3m 58s
rhoso-architecture-validate-uni06zeta FAILURE in 3m 30s
rhoso-architecture-validate-uni07eta FAILURE in 4m 39s

Copy link
Contributor

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/a6bc6029df4a403694343cf9aca15e5a

✔️ noop SUCCESS in 0s
rhoso-architecture-validate-bgp FAILURE in 4m 03s
rhoso-architecture-validate-bgp_dt01 FAILURE in 4m 05s
rhoso-architecture-validate-hci FAILURE in 4m 07s
rhoso-architecture-validate-nfv-ovs-dpdk-sriov-hci FAILURE in 4m 06s
rhoso-architecture-validate-osasinfra FAILURE in 4m 24s
rhoso-architecture-validate-ovs-dpdk FAILURE in 4m 07s
rhoso-architecture-validate-ovs-dpdk-sriov FAILURE in 4m 17s
rhoso-architecture-validate-pidone FAILURE in 4m 25s
rhoso-architecture-validate-sriov FAILURE in 4m 05s
rhoso-architecture-validate-uni01alpha FAILURE in 4m 23s
rhoso-architecture-validate-uni02beta FAILURE in 4m 10s
rhoso-architecture-validate-uni04delta FAILURE in 4m 22s
rhoso-architecture-validate-uni04delta-ipv6 FAILURE in 4m 13s
rhoso-architecture-validate-uni05epsilon FAILURE in 4m 09s
rhoso-architecture-validate-uni06zeta FAILURE in 3m 57s
rhoso-architecture-validate-uni07eta FAILURE in 4m 04s

@fultonj fultonj marked this pull request as draft August 29, 2024 19:53
Copy link
Contributor

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/fe2818ebbd084744b003de22007e7561

✔️ noop SUCCESS in 0s
rhoso-architecture-validate-bgp FAILURE in 4m 18s
rhoso-architecture-validate-bgp_dt01 FAILURE in 3m 19s
rhoso-architecture-validate-hci FAILURE in 3m 32s
rhoso-architecture-validate-nfv-ovs-dpdk-sriov-hci FAILURE in 4m 13s
rhoso-architecture-validate-osasinfra FAILURE in 4m 10s
rhoso-architecture-validate-ovs-dpdk FAILURE in 4m 23s
rhoso-architecture-validate-ovs-dpdk-sriov FAILURE in 5m 07s
rhoso-architecture-validate-pidone FAILURE in 4m 40s
rhoso-architecture-validate-sriov FAILURE in 4m 15s
rhoso-architecture-validate-uni01alpha FAILURE in 4m 23s
rhoso-architecture-validate-uni02beta FAILURE in 4m 19s
rhoso-architecture-validate-uni04delta FAILURE in 4m 53s
rhoso-architecture-validate-uni04delta-ipv6 FAILURE in 4m 11s
rhoso-architecture-validate-uni05epsilon FAILURE in 4m 18s
rhoso-architecture-validate-uni06zeta FAILURE in 4m 36s
rhoso-architecture-validate-uni07eta FAILURE in 4m 18s

Copy link
Contributor

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/c2eb70ccb80545fd9ced7c7b6530b813

✔️ noop SUCCESS in 0s
rhoso-architecture-validate-uni04delta FAILURE in 3m 07s

Copy link
Contributor

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/71d89153136f49ecab9affb220ef60dc

✔️ noop SUCCESS in 0s
rhoso-architecture-validate-uni04delta FAILURE in 3m 14s

Copy link
Contributor

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/7a5800f1986b421a813c034e40c77aca

✔️ noop SUCCESS in 0s
rhoso-architecture-validate-uni04delta FAILURE in 3m 11s

@fultonj
Copy link
Contributor Author

fultonj commented Sep 5, 2024

recheck

Copy link
Contributor

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/aee7effdd8a74b68a8847e68d53b9aae

✔️ noop SUCCESS in 0s
rhoso-architecture-validate-uni04delta FAILURE in 3m 32s

@fultonj fultonj marked this pull request as ready for review September 9, 2024 19:21
@fultonj fultonj requested review from fmount and removed request for leifmadsen and raukadah September 9, 2024 19:21
@fultonj
Copy link
Contributor Author

fultonj commented Sep 9, 2024

Todo:

With this change kustomize build examples/dt/uni04delta produces an OpenStackControlPlane with the following:

      manilaShares:
        share1:
          networkAttachments:
          - storage

but nfs should be in the list of networkAttachments.

https://github.com/openstack-k8s-operators/architecture/blob/main/lib/control-plane/openstackcontrolplane.yaml#L127-L130

@fultonj
Copy link
Contributor Author

fultonj commented Sep 9, 2024

Todo:

With this change kustomize build examples/dt/uni04delta produces an OpenStackControlPlane with the following:

      manilaShares:
        share1:
          networkAttachments:
          - storage

but nfs should be in the list of networkAttachments.

https://github.com/openstack-k8s-operators/architecture/blob/main/lib/control-plane/openstackcontrolplane.yaml#L127-L130

The following change adds nfs to the networkAttachments list.

https://github.com/openstack-k8s-operators/architecture/compare/4cb3db3c8dda30d1bba7e458cc7d465d454d5f95..c590dafbdf33e8d7e5b068e2f0839cea63a125e1

name: controlplane
patch: |-
- op: add
path: /spec/manila/template/manilaShares/share1/networkAttachments/-
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't need a NAD on the storageNFS network because the new Manila driver interacts w/ the ceph mgr nfs module. For this reason manila-share only needs to reach the Ceph public network (storage), while the EDPM nodes needs direct access to StorageNFS because the workload needs to mount the share provided by ceph-nfs cluster.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the manila share pod does not need to be able to access the cifmw_cephadm_nfs_vip, then I can remove this line. Thanks.

https://github.com/openstack-k8s-operators/ci-framework/blob/main/roles/cifmw_cephadm/tasks/cephnfs.yml#L20

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correct, we don't need to add this additional nad, so I guess L40-L48 can be removed.
cifmw_cephadm_nfs_vip is required on the Ceph side (hence we need it on the edpm nodes), and that network should be "abstracted" at tenant level to allow the workload mount the share using cifmw_cephadm_nfs_vip.
Manila itself just need to connect to ceph, and the driver actually uses the ceph nfs ... interface (mgr plugin) to do crud operations against ganesha (this removed the old dbus dependency we had in TripleO).

dt/uni04delta/kustomization.yaml Show resolved Hide resolved
@fultonj
Copy link
Contributor Author

fultonj commented Sep 10, 2024

todo:

  • streamline the kustomize per andrew's example

@fultonj fultonj added the do-not-merge Changes are not ready to be merged label Sep 10, 2024
Manila Tempest tests need to connect to the share for
Ganesha via a special (openstack) network [1].

This patch adds the NFS storage network with VLAN 24 and
range 172.21.0.0/24 in uni04delta. The NFS 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 the storage tests
and the manilaShares pod(s).

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.

[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
Depends-On: openstack-k8s-operators/ci-framework#2273

Signed-off-by: John Fulton <[email protected]>
@fultonj
Copy link
Contributor Author

fultonj commented Sep 19, 2024

Obsoleted by #405

@fultonj fultonj closed this Sep 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved do-not-merge Changes are not ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants