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

(Backport 50635) btrfs: add new btrfs state #54962

Closed
wants to merge 4 commits into from

Conversation

aplanas
Copy link
Contributor

@aplanas aplanas commented Oct 11, 2019

What does this PR do?

Add a new btrfs state to create and delete subvolumes.

Tests written?

Yes

(backport #50635 and #50801, already merged in develop)

salt/states/btrfs.py Outdated Show resolved Hide resolved
aplanas and others added 4 commits April 17, 2020 16:44
(cherry picked from commit 237d40d)
When we want to create a subvolume and set is as default, we can
use the set_default parameter. The current code will check, for
already created subvolumes, if it is actually marked as default,
and if not it will be set inside the state.

For composability with other states, we sometimes want to avoid
the re-set of the default flag for already present subvolumes, as
can be that this was change in a later action by another state.

(cherry picked from commit 067482e)
@Ch3LL
Copy link
Contributor

Ch3LL commented Apr 22, 2020

looks like there are some merge conflicts here @aplanas

@aplanas
Copy link
Contributor Author

aplanas commented Apr 23, 2020

This is excellent, the code was already merged in a branch that was using this same code. I will close it.

@aplanas aplanas closed this Apr 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants