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

ceph_orch_spec: Add ceph orch apply spec feature (backport #7552) #7564

Merged
merged 1 commit into from
May 22, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 21, 2024

fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2262133


This is an automatic backport of pull request #7552 done by Mergify.

Copy link
Author

mergify bot commented May 21, 2024

Cherry-pick of f6fd034 has failed:

On branch mergify/bp/stable-7.0/pr-7552
Your branch is up to date with 'origin/stable-7.0'.

You are currently cherry-picking commit f6fd034e7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   library/ceph_orch_apply.py
	modified:   module_utils/ca_common.py
	modified:   tests/requirements.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   infrastructure-playbooks/cephadm-adopt.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label May 21, 2024
Add new module ceph_orch_spec which applies ceph spec files.
This feature was needed to bind extra mount points to the RGW
container (/etc/pki/ca-trust/).

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2262133

Signed-off-by: Teoman ONAY <[email protected]>
(cherry picked from commit f6fd034)
@asm0deuz asm0deuz force-pushed the mergify/bp/stable-7.0/pr-7552 branch from cb8a7d2 to 22c4a4f Compare May 21, 2024 11:32
Copy link
Collaborator

@asm0deuz asm0deuz left a comment

Choose a reason for hiding this comment

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

LGTM

@asm0deuz asm0deuz merged commit b80b68b into stable-7.0 May 22, 2024
28 checks passed
@asm0deuz asm0deuz deleted the mergify/bp/stable-7.0/pr-7552 branch May 22, 2024 11:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant