-
Notifications
You must be signed in to change notification settings - Fork 197
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
Correctly switch to Salt Bundle on transactional systems (bsc#1232562) #9803
base: master
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the pull request! The approach looks good, with the current service
state module needing dbus
, this way is good workaround to only disable or enable services.
mgr_disable_salt_minion
has the same problem as mgr_enable_venv_salt_minion
, please add a similar workaround for that state.
mgr_enable_venv_salt-minion: | ||
service.running: | ||
- name: venv-salt-minion.service |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This implementation (with additional arguments) is already defined in lines 59-64. I would drop this part and move the Jinja2 if/else control structure to the existing definition (together with the transactional-update branch.
fa26e8c
to
be6c27e
Compare
- require: | ||
- cmd: mgr_copy_salt_minion_keys |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This dependency is still required here.
susemanager-utils/susemanager-sls/salt/util/mgr_switch_to_venv_minion.sls
Show resolved
Hide resolved
@@ -0,0 +1 @@ | |||
- Enable venv-salt-minion disable salt-minion service based on os |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changelog needs to mention the bug id and is target at the end-user. I think the current wording is not very clear for end-users. How about the following?
- Enable venv-salt-minion disable salt-minion service based on os | |
- Correctly switch to Salt Bundle on transactional systems | |
(bsc#1232562) |
be6c27e
to
03e1db9
Compare
03e1db9
to
aa7da72
Compare
aa7da72
to
a7f1804
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the update, the code and changelog look good now 🚀
! It would be great if you could fill out the rest of the pull request description template and we're ready to merge this PR. For the "Links" section you can already create backports for 4.3 and 5.0 and add links to those pull requests.
What does this PR change?
Enables venv-salt-minion.service after salt-bundle conversion and disables salt-minion.service depending on the system, if its transactional or non-transactional
GUI diff
No difference.
Documentation
No documentation needed
DONE
Test coverage
ℹ️ If a major new functionality is added, it is strongly recommended that tests for the new functionality are added to the Cucumber test suite
No tests
DONE
Links
Issue(s): # https://github.com/SUSE/spacewalk/issues/25795
Port(s): # add downstream PR(s), if any
Changelogs
Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository
If you don't need a changelog check, please mark this checkbox:
If you uncheck the checkbox after the PR is created, you will need to re-run
changelog_test
(see below)Re-run a test
If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:
Before you merge
Check How to branch and merge properly!