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

Added test mode to states.dockerng. Resolves #33632. #33659

Merged
merged 1 commit into from
Jun 2, 2016

Conversation

danslimmon
Copy link
Contributor

What does this PR do?

Fixes #33632 by adding test mode awareness to states.dockerng.volume_present

What issues does this PR fix or reference?

#33632.

Previous Behavior

Calling salt <insert hostname> state.sls docker.test test=True would create a volume.

New Behavior

Calling salt <insert hostname> state.sls docker.test test=True logs what it would do but doesn't create anything.

Tests written?

No, as this is a fix for the test mode of the state.

@cachedout
Copy link
Contributor

@danslimmon Would you mind rebasing this? There are merge conflicts.

@terminalmage and @ticosax Any feedback here?

@cachedout cachedout added the Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged label Jun 1, 2016
@danslimmon
Copy link
Contributor Author

danslimmon commented Jun 1, 2016

Rebased!

EDIT: Whoa, wait, I did something really wrong merge-wise. Let me see what that was...

EDIT: Should be fixed now. Fingers crossed on the tests.

@cachedout
Copy link
Contributor

cachedout commented Jun 1, 2016

@danslimmon Looks better. I'm going to let this sit overnight since @ticosax is on the other side of the world and I'd like for him to have a chance to look it over. Thanks!

@cachedout
Copy link
Contributor

Doesn't look like any comments came back so I'm going to go ahead and get this in. Thanks, @danslimmon

@cachedout cachedout merged commit d3253ef into saltstack:2016.3 Jun 2, 2016
@ticosax
Copy link
Contributor

ticosax commented Jun 3, 2016

👍 thanks @danslimmon

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants