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

Only call configure_object tasks when rgw_enabled is true #1931

Merged

Conversation

fultonj
Copy link
Contributor

@fultonj fultonj commented Jun 21, 2024

RGW related tasks are called by playbooks/ceph.yml only if cifmw_ceph_daemons_layout.rgw_enabled is true but the post tasks in the cifmw_cephadm role need the same rule. This patch adds that rule.

We didn't discover this until PR 1821 merged. The "Create swift service, user and roles" task in post, only ran when cifmw_ceph_daemons_layout.rgw_enabled was true. When PR 1821 merged it added tasks to do the same but they didn't have this condition. Those conditions are removed by this patch as the entire configure_boject tasks file is no longer included by post (and only post includes that file) unless cifmw_ceph_daemons_layout.rgw_enabled is true.

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

As a pull request owner and reviewers, I checked that:

  • Appropriate testing is done and actually running
  • Appropriate documentation exists and/or is up-to-date:
    • README in the role
    • Content of the docs/source is reflecting the changes

RGW related tasks are called by playbooks/ceph.yml only if
`cifmw_ceph_daemons_layout.rgw_enabled` is true but the
post tasks in the cifmw_cephadm role need the same rule.
This patch adds that rule.

We didn't discover this until PR 1821 merged. The "Create
swift service, user and roles" task in post, only ran when
`cifmw_ceph_daemons_layout.rgw_enabled` was true. When PR
1821 merged it added tasks to do the same but they didn't
have this condition. Those conditions are removed by this
patch as the entire configure_boject tasks file is no longer
included by post (and only post includes that file) unless
`cifmw_ceph_daemons_layout.rgw_enabled` is true.

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

Signed-off-by: John Fulton <fulton@redhat.com>
@github-actions github-actions bot marked this pull request as draft June 21, 2024 20:54
Copy link

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.

@fultonj fultonj requested a review from katarimanojk June 21, 2024 20:54
@fultonj fultonj marked this pull request as ready for review June 21, 2024 20:55
@fultonj fultonj requested a review from fmount June 21, 2024 20:56
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 thank you!

Copy link
Contributor

@katarimanojk katarimanojk left a comment

Choose a reason for hiding this comment

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

Thanks for the PR.
/lgtm

@cjeanner
Copy link
Contributor

/approve

Copy link
Contributor

openshift-ci bot commented Jun 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cjeanner

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

@openshift-merge-bot openshift-merge-bot bot merged commit 97a8ba1 into openstack-k8s-operators:main Jun 24, 2024
7 checks passed
@fultonj fultonj deleted the OSPRH-7889 branch January 28, 2025 23:51
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