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 Swift network for RGW to HCI scenario #404

Merged

Conversation

fultonj
Copy link
Contributor

@fultonj fultonj commented Sep 18, 2024

When Ceph RGW is used, an endpoint for Swift storage is hosted not in a pod on k8s but on an EDPM node. Thus, a service hosted on an EDPM node will need to be accessed by cloud users from a separate network.

This patch adds the Swift storage network (swift) with VLAN 25 and range 172.22.0.0/24 in the HCI values example. The Swift network is configured on the HCI EDPM nodes and an NNCP, NAD, L2Advertisement and IPAddressPool are defined so that a pod in k8s can connect to it; such as the tempest pod which will perform object storage tests.

Jira: https://issues.redhat.com/browse/OSPRH-6675

@openshift-ci openshift-ci bot requested review from abays and leifmadsen September 18, 2024 19:39
@fultonj fultonj requested review from fmount and removed request for leifmadsen September 18, 2024 19:40
@fultonj fultonj force-pushed the net2 branch 2 times, most recently from 9fcbb44 to 380fc63 Compare September 20, 2024 16:16
Copy link
Contributor

@abays abays left a comment

Choose a reason for hiding this comment

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

I'm good with this once @fultonj is satisfied with its testing results

name: swift
subnetName: subnet1
- op: add
path: /spec/nodes/edpm-compute-0/networks/-
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is failing because the name will always have a random string appended to it:

       nodes:
            edpm-compute-eeua7yef-0:
                ansible:
                    host: 192.168.122.100
                hostName: compute-eeua7yef-0
                networks:

I get this error:

add operation does not apply: doc is missing path: \\\"/spec/nodes/edpm-compute-0/networks/-\\\": missing value\""'

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because of the dependency on openstack-k8s-operators/ci-framework#2301 the ci-framework when the job is run by the ci-framework I already end up having those values. Thus, I could simply remove those lines.

        networks:
        -   defaultRoute: true
            name: ctlplane
            subnetName: subnet1
        -   name: internalapi
            subnetName: subnet1
        -   name: storage
            subnetName: subnet1
        -   name: tenant
            subnetName: subnet1
        nodes:
            edpm-compute-eeua7yef-0:
                ansible:
                    host: 192.168.122.100
                hostName: compute-eeua7yef-0
                networks:
                -   defaultRoute: true
                    fixedIP: 192.168.122.100
                    name: ctlplane
                    subnetName: subnet1
                -   name: internalapi
                    subnetName: subnet1
                -   name: storage
                    subnetName: subnet1
                -   name: storagemgmt
                    subnetName: subnet1
                -   name: swift
                    subnetName: subnet1
                -   name: tenant
                    subnetName: subnet1
            edpm-compute-eeua7yef-1:
                ansible:
                    host: 192.168.122.101
                hostName: compute-eeua7yef-1
                networks:
                -   defaultRoute: true
                    fixedIP: 192.168.122.101
                    name: ctlplane
                    subnetName: subnet1
                -   name: internalapi
                    subnetName: subnet1
                -   name: storage
                    subnetName: subnet1
                -   name: storagemgmt
                    subnetName: subnet1
                -   name: swift
                    subnetName: subnet1
                -   name: tenant
                    subnetName: subnet1
            edpm-compute-eeua7yef-2:
                ansible:
                    host: 192.168.122.102
                hostName: compute-eeua7yef-2
                networks:
                -   defaultRoute: true
                    fixedIP: 192.168.122.102
                    name: ctlplane
                    subnetName: subnet1
                -   name: internalapi
                    subnetName: subnet1
                -   name: storage
                    subnetName: subnet1
                -   name: storagemgmt
                    subnetName: subnet1
                -   name: swift
                    subnetName: subnet1
                -   name: tenant
                    subnetName: subnet1

@fultonj
Copy link
Contributor Author

fultonj commented Sep 23, 2024

/test unit

@fultonj
Copy link
Contributor Author

fultonj commented Sep 24, 2024

@abays @fmount

A test project (uni03gamma-rhel9-rhoso18.0-titan105-ceph) which depends on this patch is green so we are safe to merge.

Copy link
Contributor

@fmount fmount left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link

openshift-ci bot commented Sep 25, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fmount, 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

Copy link
Contributor

Build failed (gate pipeline). For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

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

Warning:
Change 2301 in project openstack-k8s-operators/ci-framework does not share a change queue with 404 in project openstack-k8s-operators/architecture

Copy link
Contributor

Build failed (gate pipeline). For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

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

Warning:
Change 2301 in project openstack-k8s-operators/ci-framework does not share a change queue with 404 in project openstack-k8s-operators/architecture

When Ceph RGW is used, an endpoint for Swift storage is
hosted not in a pod on k8s but on an EDPM node. Thus, a
service hosted on an EDPM node will need to be accessed
by cloud users from a separate network.

This patch adds the Swift storage network (swift) with
VLAN 25 and range 172.22.0.0/24 in the HCI values example.
The Swift network is configured on the HCI EDPM nodes
and an NNCP, NAD, L2Advertisement and IPAddressPool are
defined so that a pod in k8s can connect to it; such as
the tempest pod which will perform object storage tests.

Jira: https://issues.redhat.com/browse/OSPRH-6675

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

openshift-ci bot commented Sep 25, 2024

New changes are detected. LGTM label has been removed.

@abays abays added the lgtm label Sep 25, 2024
@abays
Copy link
Contributor

abays commented Sep 25, 2024

recheck-gate

Copy link
Contributor

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 69a4aed into openstack-k8s-operators:main Sep 25, 2024
7 checks passed
@fultonj
Copy link
Contributor Author

fultonj commented Sep 25, 2024

/cherrypick 18.0.0-proposed

@openshift-cherrypick-robot

@fultonj: new pull request created: #407

In response to this:

/cherrypick 18.0.0-proposed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

hjensas added a commit to hjensas/ci-framework that referenced this pull request Sep 26, 2024
The swift network was added to the HCI scenario used in the molecule
tests here: openstack-k8s-operators/architecture#404
openshift-merge-bot bot pushed a commit to openstack-k8s-operators/ci-framework that referenced this pull request Sep 26, 2024
The swift network was added to the HCI scenario used in the molecule
tests here: openstack-k8s-operators/architecture#404
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/ci-framework that referenced this pull request Sep 26, 2024
The swift network was added to the HCI scenario used in the molecule
tests here: openstack-k8s-operators/architecture#404
openshift-merge-bot bot pushed a commit to openstack-k8s-operators/ci-framework that referenced this pull request Sep 26, 2024
The swift network was added to the HCI scenario used in the molecule
tests here: openstack-k8s-operators/architecture#404
softwarefactory-project-zuul bot added a commit that referenced this pull request Oct 2, 2024
Revert addition of Swift network to va/hci

This PR reverts the following merged PRs:

#409
#404

For reasons documented in the Jira below we will not add the RGW network to va/hci.
Jira: https://issues.redhat.com/browse/OSPRH-10496

Reviewed-by: Francesco Pantano <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants