fix: restore Galaxy dependency removals lost in a merge resolution#1373
Merged
Conversation
The merge resolution for the ELK retirement inadvertently kept the six retired ELK role entries and resurrected two entries removed by earlier merged changes (the replaced third-party MAAS role and the vendored chrony role). None of these are consumed by any playbook — the MAAS playbook uses the in-repo maas-controller role and chrony uses the vendored deepops_chrony role — but setup.sh was fetching them again. Restore the file to its intended post-cleanup state.
michael-balint
approved these changes
Jul 20, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
roles/requirements.ymlcleanups that were lost in the merge resolution of Retire the Slurm ELK logging playbook #1368: the six retired ELK role entries were kept and two previously removed entries were resurrected (the third-party MAAS role replaced bymaas-controllerin Replace third-party MAAS role with a DeepOps-owned controller role #1367, and the chrony role vendored asdeepops_chronyin Vendor first-party utility roles into the repository #1369)../scripts/setup.shstops fetching retired dependencies.Validation
git diff --checkclean; entry-by-entry match against the intended end state of Replace third-party MAAS role with a DeepOps-owned controller role #1367/Retire the Slurm ELK logging playbook #1368/Vendor first-party utility roles into the repository #1369 (seven role entries remain, each with a live consumer).