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

Configure Ceph RGW with a object storage network #2301

Merged
merged 1 commit into from
Sep 25, 2024

Conversation

fultonj
Copy link
Contributor

@fultonj fultonj commented Sep 3, 2024

When Ceph RGW is used, an endpoint for object 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 from a separate network.

This patch adds the object storage network (storageobj) with VLAN 25 and range 172.22.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 object storage network is added to the OCP nodes for the same reason.

The Ceph playbook cifmw_cephadm_rgw_network parameter may then be set to the new network so that object storage may be configured on a separate network. If this network is parameter is not set, then the storage network is used.

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

Copy link

github-actions bot commented Sep 3, 2024

Thanks for the PR! ❤️
I'm marking it as a draft, once your happy with it merging and the PR is passing CI, click the "Ready for review" button below.

@github-actions github-actions bot marked this pull request as draft September 3, 2024 16:55
@fultonj fultonj force-pushed the net branch 2 times, most recently from 7096663 to aa81cc1 Compare September 3, 2024 20:58
Copy link

This change depends on a change that failed to merge.

Change openstack-k8s-operators/architecture#386 is needed.

fultonj added a commit to fultonj/architecture that referenced this pull request Sep 4, 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.

In order to make these changes va/hci 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.

Jira: https://issues.redhat.com/browse/OSPRH-6675
Depends-On: openstack-k8s-operators/ci-framework#2301

Signed-off-by: John Fulton <[email protected]>
fultonj added a commit to fultonj/architecture that referenced this pull request Sep 4, 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.

In order to make these changes va/hci 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.

Jira: https://issues.redhat.com/browse/OSPRH-6675
Depends-On: openstack-k8s-operators/ci-framework#2301

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

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/ee21a0187a9d4994bce1b1df1f664c44

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 06m 29s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 15m 23s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 21m 30s
✔️ podified-multinode-hci-deployment-crc SUCCESS in 1h 38m 03s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 55s
cifmw-pod-pre-commit FAILURE in 7m 23s
✔️ cifmw-architecture-validate-hci SUCCESS in 4m 03s
✔️ build-push-container-cifmw-client SUCCESS in 36m 32s
✔️ cifmw-molecule-cifmw_cephadm SUCCESS in 5m 01s
✔️ cifmw-molecule-kustomize_deploy SUCCESS in 4m 17s

fultonj added a commit to fultonj/architecture that referenced this pull request Sep 5, 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.

In order to make these changes va/hci 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.

Jira: https://issues.redhat.com/browse/OSPRH-6675
Depends-On: openstack-k8s-operators/ci-framework#2301

Signed-off-by: John Fulton <[email protected]>
@fultonj fultonj force-pushed the net branch 2 times, most recently from 61a95bb to 23eeae2 Compare September 5, 2024 15:33
fultonj added a commit to fultonj/architecture that referenced this pull request Sep 5, 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.

In order to make these changes va/hci 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.

Jira: https://issues.redhat.com/browse/OSPRH-6675
Depends-On: openstack-k8s-operators/ci-framework#2301

Signed-off-by: John Fulton <[email protected]>
@fultonj fultonj force-pushed the net branch 2 times, most recently from 2e70376 to 98569d4 Compare September 6, 2024 13:58
Copy link

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/5297f3bae143457daeb1c7d2b242812f

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 55m 22s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 15m 05s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 22m 41s
✔️ podified-multinode-hci-deployment-crc SUCCESS in 1h 41m 46s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 9m 51s
✔️ cifmw-pod-pre-commit SUCCESS in 10m 15s
build-push-container-cifmw-client POST_FAILURE in 21m 38s
✔️ cifmw-molecule-cifmw_cephadm SUCCESS in 6m 17s

fultonj added a commit to fultonj/architecture that referenced this pull request Sep 17, 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.

In order to make these changes va/hci 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.

Jira: https://issues.redhat.com/browse/OSPRH-6675
Depends-On: openstack-k8s-operators/ci-framework#2301

Signed-off-by: John Fulton <[email protected]>
fultonj added a commit to fultonj/architecture that referenced this pull request 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
Depends-On: openstack-k8s-operators/ci-framework#2301

Signed-off-by: John Fulton <[email protected]>
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
from a separate network.

This patch adds the Swift storage network (swift) with
VLAN 25 and range 172.22.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 Swift storage network is added
to the OCP nodes for the same reason. The swift network
is also added to the ci playbook networking-env-definition
for the rhoso-architecture-validate-hci github-check.

The Ceph playbook cifmw_cephadm_rgw_network parameter may
then be set to the new swift network so that RGW is then
configured on a separate network. If this network
parameter is not set, then the storage network is used.

Signed-off-by: John Fulton <[email protected]>
@fultonj fultonj marked this pull request as ready for review September 18, 2024 19:46
fultonj added a commit to fultonj/architecture that referenced this pull request Sep 20, 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
Depends-On: openstack-k8s-operators/ci-framework#2301

Signed-off-by: John Fulton <[email protected]>
fultonj added a commit to fultonj/architecture that referenced this pull request Sep 20, 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
Depends-On: openstack-k8s-operators/ci-framework#2301

Signed-off-by: John Fulton <[email protected]>
fultonj added a commit to fultonj/architecture that referenced this pull request Sep 20, 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
Depends-On: openstack-k8s-operators/ci-framework#2301

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

fultonj commented Sep 24, 2024

@abays @fmount @cjeanner @pablintino

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

@pablintino
Copy link
Collaborator

/approve

Copy link
Contributor

@rebtoor rebtoor left a comment

Choose a reason for hiding this comment

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

/approve

Copy link
Contributor

openshift-ci bot commented Sep 25, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pablintino, rebtoor

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

@rebtoor
Copy link
Contributor

rebtoor commented Sep 25, 2024

/lgtm

@fmount
Copy link
Contributor

fmount commented Sep 25, 2024

Thank you @fultonj @rebtoor @pablintino !

@openshift-merge-bot openshift-merge-bot bot merged commit 531e001 into openstack-k8s-operators:main Sep 25, 2024
5 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: #2384

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.

fultonj added a commit to fultonj/ci-framework that referenced this pull request Sep 26, 2024
Use the existing `cifmw_cephadm_monitoring_network`
parameter to configure the Ceph dashboard instead of
the `cifmw_cephadm_rgw_network` parameter. This was
not detected earlier because the Ceph playbook set them
both to the Ceph public_network, but we recently added
a feature to run RGW on a separate network [1].
Also, add retries/delay to the dashboard HTTP check.

[1] openstack-k8s-operators#2301

Jira: https://issues.redhat.com/browse/OSPCIX-506

Signed-off-by: John Fulton <[email protected]>
fultonj added a commit to fultonj/ci-framework that referenced this pull request Sep 27, 2024
Use the existing `cifmw_cephadm_monitoring_network`
parameter to configure the Ceph dashboard instead of
the `cifmw_cephadm_rgw_network` parameter. This was
not detected earlier because the Ceph playbook set them
both to the Ceph public_network, but we recently added
a feature to run RGW on a separate network [1].
Also, add retries/delay to the dashboard HTTP check
and mange if HTTPS should be used.

[1] openstack-k8s-operators#2301

Jira: https://issues.redhat.com/browse/OSPCIX-506

Signed-off-by: John Fulton <[email protected]>
fultonj added a commit to fultonj/ci-framework that referenced this pull request Sep 27, 2024
Use the existing `cifmw_cephadm_monitoring_network`
parameter to configure the Ceph dashboard instead of
the `cifmw_cephadm_rgw_network` parameter. This was
not detected earlier because the Ceph playbook set them
both to the Ceph public_network, but we recently added
a feature to run RGW on a separate network [1].
Also, add retries/delay to the dashboard HTTP check
and mange if HTTPS should be used.

[1] openstack-k8s-operators#2301

Jira: https://issues.redhat.com/browse/OSPCIX-506

Signed-off-by: John Fulton <[email protected]>
fultonj added a commit to fultonj/ci-framework that referenced this pull request Sep 27, 2024
Use the existing `cifmw_cephadm_monitoring_network`
parameter to configure the Ceph dashboard instead of
the `cifmw_cephadm_rgw_network` parameter. This was
not detected earlier because the Ceph playbook set them
both to the Ceph public_network, but we recently added
a feature to run RGW on a separate network [1].
Also, add retries/delay to the dashboard HTTP check
and mange if HTTPS should be used.

[1] openstack-k8s-operators#2301

Jira: https://issues.redhat.com/browse/OSPCIX-506

Signed-off-by: John Fulton <[email protected]>
openshift-merge-bot bot pushed a commit that referenced this pull request Sep 27, 2024
Use the existing `cifmw_cephadm_monitoring_network`
parameter to configure the Ceph dashboard instead of
the `cifmw_cephadm_rgw_network` parameter. This was
not detected earlier because the Ceph playbook set them
both to the Ceph public_network, but we recently added
a feature to run RGW on a separate network [1].
Also, add retries/delay to the dashboard HTTP check
and mange if HTTPS should be used.

[1] #2301

Jira: https://issues.redhat.com/browse/OSPCIX-506

Signed-off-by: John Fulton <[email protected]>
fultonj added a commit to fultonj/ci-framework that referenced this pull request Sep 27, 2024
Use the existing `cifmw_cephadm_monitoring_network`
parameter to configure the Ceph dashboard instead of
the `cifmw_cephadm_rgw_network` parameter. This was
not detected earlier because the Ceph playbook set them
both to the Ceph public_network, but we recently added
a feature to run RGW on a separate network [1].
Also, add retries/delay to the dashboard HTTP check
and mange if HTTPS should be used.

[1] openstack-k8s-operators#2301

Jira: https://issues.redhat.com/browse/OSPCIX-506

(cherry-picked from f6e4645)

Signed-off-by: John Fulton <[email protected]>
openshift-merge-bot bot pushed a commit that referenced this pull request Sep 30, 2024
Use the existing `cifmw_cephadm_monitoring_network`
parameter to configure the Ceph dashboard instead of
the `cifmw_cephadm_rgw_network` parameter. This was
not detected earlier because the Ceph playbook set them
both to the Ceph public_network, but we recently added
a feature to run RGW on a separate network [1].
Also, add retries/delay to the dashboard HTTP check
and mange if HTTPS should be used.

[1] #2301

Jira: https://issues.redhat.com/browse/OSPCIX-506

(cherry-picked from f6e4645)

Signed-off-by: John Fulton <[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.

5 participants