Only remove only salt-client if this is a server #1331
Conversation
This file contains 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
Otherwise, remove all salt packages. This reverts commit 59104d3 and adds a "is server" case. s Signed-off-by: Jordi Massaguer Pla <jmassaguerpla@suse.de>
meaksh
reviewed
Aug 9, 2023
| elif [[ "$INSTALLER" == "apt" ]]; then | ||
| apt-get --yes purge salt-common > /dev/null 2>&1 ||: | ||
| if [[ "$SERVER" == "true" ]];then | ||
| apt-get --yes purge salt-client > /dev/null 2>&1 ||: |
There was a problem hiding this comment.
I think it should be salt-minion here, right?
Suggested change
| apt-get --yes purge salt-client > /dev/null 2>&1 ||: | |
| apt-get --yes purge salt-minion > /dev/null 2>&1 ||: |
| @@ -14,6 +14,17 @@ fi | |||
|
|
|||
| # Nothing to do in case "install_salt_bundle" grain is not true | |||
| INSTALL_SALT_BUNDLE=$(${SALT_CALL} --local --log-level=quiet --output=txt grains.get install_salt_bundle) | |||
| SERVER=false | |||
| ROLES=$(${SALT_CALL} --local --log-level=quiet --output=txt grains.get roles) | |||
| if [[ "${ROLES}" == "local: ['server']" ]];then | |||
There was a problem hiding this comment.
The roles variable is a actually a list, so in principle it could accept multiple values and therefore this comparision would fail.
Maybe something like:
Suggested change
| if [[ "${ROLES}" == "local: ['server']" ]];then | |
| if [[ "${ROLES}" == *"'server'"* ]];then |
What do you think?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR change?
Only remove only salt-client if this is a server.
Otherwise, remove all salt packages.
This reverts commit 59104d3 and adds a "is server" case.