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

Fix prerequisites in cephadm-preflight #284

Closed
wants to merge 0 commits into from

Conversation

droidben
Copy link
Contributor

I noticed that clients configured with cephadm-preflight.yml were not getting prerequisite packages installed. This was due to a wrong conditional in the playbook.

Also lvm2 is an official prerequisite as per the docs so I added it to the infra packages in the defaults as not all distros in all feature-flavors come with it installed.

@droidben droidben changed the title Fix prerequisites Fix prerequisites in cephadm-preflight Mar 29, 2024
@droidben
Copy link
Contributor Author

droidben commented Apr 1, 2024

I misinterpreted the clients group and what its purpose was supposed to be, hence my latest commit. But there is still the problem, that the clients group is left untouched by the preflight playbook. This is also fixed my this PR.

If you are still unsure as to what this is supposed to accomplish, here a comparison in playbook runs. Here rocky9-01 is admin, but not client and osd. The rest (02-04) is admin, client and osd.

existing prefligt playbook

TASK [install prerequisites packages on servers]
ok: [rocky9-01.testcluster.local]                     
changed: [rocky9-03.testcluster.local]                
changed: [rocky9-02.testcluster.local]                
changed: [rocky9-04.testcluster.local]                
                                                
TASK [install prerequisites packages on clients]
skipping: [rocky9-01.testcluster.local]               
skipping: [rocky9-02.testcluster.local]               
skipping: [rocky9-03.testcluster.local]               
skipping: [rocky9-04.testcluster.local]                  

As you can see, the clients are skipped, no packages are installed.

proposed preflight playbook

TASK [install prerequisites packages on servers]
changed: [rocky9-04.testcluster.local]                
changed: [rocky9-03.testcluster.local]                
changed: [rocky9-01.testcluster.local]                
changed: [rocky9-02.testcluster.local]                
                                                
TASK [install prerequisites packages on clients]
skipping: [rocky9-01.testcluster.local]               
ok: [rocky9-04.testcluster.local]                     
ok: [rocky9-02.testcluster.local]                     
ok: [rocky9-03.testcluster.local]                     

The clients are now not immediately skipped anymore and the required packages are installed.

@droidben
Copy link
Contributor Author

droidben commented Apr 1, 2024

Requesting @asm0deuz for review.

@asm0deuz
Copy link
Collaborator

jenkins test el8-functional

@asm0deuz
Copy link
Collaborator

jenkins test el9-functional

@asm0deuz
Copy link
Collaborator

@droidben It looks good to me but you need to squash your commits into one (now there are 5 commits)

@droidben droidben force-pushed the fix-prerequisites branch 2 times, most recently from c26ce06 to cfacb65 Compare May 9, 2024 11:06
@droidben
Copy link
Contributor Author

@asm0deuz Commits have been squashed

@droidben
Copy link
Contributor Author

@asm0deuz I recommend to merge this soon so the sourcebranch does not go into conflict again

@asm0deuz
Copy link
Collaborator

@droidben There are still 3 commits, there should only be one "added lvm2 to infra packages". You need to stash and remove the 2 other ones

@droidben
Copy link
Contributor Author

@asm0deuz There is only 1 commit from me, all others are because the branch got out of sync and I had to merge the upstream diffs.

@droidben droidben force-pushed the fix-prerequisites branch from 3712e78 to cfacb65 Compare June 16, 2024 21:43
@droidben
Copy link
Contributor Author

droidben commented Jun 16, 2024

@asm0deuz Could you please clarify what is taking so long? With the time more merge conflicts will inevitably appear. And if you, as per your last comment, do not want me to update my branch, please at least merge this soon.

In the meantime, I have reset to the original commit, so that you have to do the merging yourself if that's what you wanted.

@asm0deuz
Copy link
Collaborator

asm0deuz commented Jul 9, 2024

@droidben Just rebase it and I'll do the merge if the tests pass.

@droidben
Copy link
Contributor Author

droidben commented Jul 9, 2024

@asm0deuz Rebased to match devel, tests are passing.

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 added backport-quincy backport quincy backport-reef backport reef labels Jul 10, 2024
@droidben droidben force-pushed the fix-prerequisites branch from 8cf47aa to 0f53dbe Compare July 10, 2024 15:18
@asm0deuz
Copy link
Collaborator

asm0deuz commented Jul 10, 2024

@droidben To fix this conflit, just do the following:

  1. Fix the conflict in ceph_defaults/defaults/main.yml keeping
 - lvm2
 - sos
  1. git add ceph_defaults/defaults/main.yml
  2. git commit -a --amend
  3. git push -f <your remote> fix-prerequisites

This should fix the issue.

@droidben droidben force-pushed the fix-prerequisites branch from 90ed533 to 19bc342 Compare July 10, 2024 18:35
@droidben droidben closed this Jul 10, 2024
@droidben droidben force-pushed the fix-prerequisites branch from 19bc342 to 40ce4c8 Compare July 10, 2024 18:42
@droidben
Copy link
Contributor Author

@asm0deuz This is exactly what was done, but due to the long wait there will be the merge conflict somewhere, we cannot forgo it. :)
As you seem unhappy with this, I will open a new PR with a fresh fork.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-quincy backport quincy backport-reef backport reef
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants