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

#46886: Use correct path to config_dir when running salt from alternate placement. #50959

Merged
merged 2 commits into from Dec 21, 2018

Conversation

Projects
None yet
4 participants
@bbh-kmd
Copy link
Contributor

commented Dec 21, 2018

What does this PR do?

Use the opts.get('config_dir') instead of variable when using multiple parallel salt-minions.

What issues does this PR fix or reference?

#46886

Previous Behavior

Use salt.syspaths.CONFIG_DIR variable

New Behavior

Use opts.get('config_dir') to obtain config dir value.

Tests written?

No

Commits signed with GPG?

No

bbh-kmd added some commits Dec 21, 2018

Merge pull request #1 from saltstack/develop
Update from upstream 20181221

@thatch45 thatch45 merged commit 0a6e4cd into saltstack:develop Dec 21, 2018

8 of 11 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
Details
codeclimate All good!
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

thatch45 added a commit that referenced this pull request Dec 26, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.