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

Fix overwriting Minion config from temporarily directory #988

Merged
merged 2 commits into from
Nov 25, 2016
Merged

Fix overwriting Minion config from temporarily directory #988

merged 2 commits into from
Nov 25, 2016

Conversation

vutny
Copy link
Contributor

@vutny vutny commented Nov 24, 2016

What does this PR do?

It fixes the Bootstrap behavior when specified temporarily configuration directory (-c) with Minion config there.

What issues does this PR fix or reference?

Fixes another case for the issue #957 explained below.

Previous Behavior

If a Minion config file is already present on target system (i.e. /etc/salt/minion), it wouldn't be overwritten from temp dir even with -F (force overwrite option), but only with -C (config-only mode).

New Behavior

A Minion config file will be overwritten from temp dir if specified either -F or -C option.

@s0undt3ch
Copy link
Contributor

Excellent as always!

@s0undt3ch s0undt3ch merged commit b917803 into saltstack:develop Nov 25, 2016
@vutny vutny deleted the fix-config-minion-from-temp-dir branch November 27, 2016 09:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants