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

Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer #34257

Merged
merged 2 commits into from
Jun 24, 2016

Conversation

rallytime
Copy link
Contributor

What does this PR do?

This change makes it possible for --config-dir to work from the CLI.

What issues does this PR fix or reference?

Fixes #34037

Previous Behavior

Using --config-dir with the gpg renderer would fail because the CLI-specified config directory setting was being ignored if gpgkeys wasn't present in /etc/salt (because you're specifying a different config directory.

New Behavior

--config-dir is respected when set from the CLI.

Tests written?

No

This change makes it possible for --config-dir to work from the CLI.

Fixes saltstack#34037
@cachedout cachedout merged commit 65c5675 into saltstack:2015.8 Jun 24, 2016
@rallytime rallytime deleted the fix-34037 branch June 24, 2016 17:35
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.

None yet

2 participants