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: remove RADOS options from CephNFS and use .nfs pool (backport #8501) #8969

Merged
merged 1 commit into from Oct 18, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 13, 2021

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added the conflicts label Oct 13, 2021
@leseb
Copy link
Member

leseb commented Oct 13, 2021

@josephsawaya would you mind sending a backport PR on release-1.7 for the original PR? Thanks!

@mergify
Copy link
Author

mergify bot commented Oct 13, 2021

This pull request has merge conflicts that must be resolved before it can be merged. @mergify[bot] please rebase it. https://rook.io/docs/rook/latest/development-flow.html#updating-your-fork

This commit updates the CephNFS CR to make the RADOS settings optional
for Ceph versions above 16.2.7 due to the NFS module changes in Ceph.
The changes in Ceph make it so the RADOS pool is always ".nfs" and the
RADOS namespace is always the name of the NFS cluster.

This commit also handles the changes in Ceph Pacific versions before 16.2.7
where the default pool name is "nfs-ganesha" instead of ".nfs".

Closes: #8450
Signed-off-by: Joseph Sawaya <jsawaya@redhat.com>
(cherry picked from commit ee791b0)
@travisn travisn force-pushed the mergify/bp/release-1.7/pr-8501 branch from 8ec56a3 to c472c69 Compare October 18, 2021 18:18
@travisn travisn removed the conflicts label Oct 18, 2021
Copy link
Member

@travisn travisn left a comment

Choose a reason for hiding this comment

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

merge conflicts resolved

@travisn travisn merged commit 4c60d0b into release-1.7 Oct 18, 2021
@mergify mergify bot deleted the mergify/bp/release-1.7/pr-8501 branch October 18, 2021 20:05
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.

None yet

2 participants