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

Update documentation to correctly state enable_gpu_grains default #49185

Merged
merged 1 commit into from Aug 18, 2018

Conversation

Projects
None yet
3 participants
@ralish
Copy link
Contributor

commented Aug 18, 2018

What does this PR do?

While the relevant code in grains/core.py does enable GPU grains by default, the default in config/__init__.py for the DEFAULT_MASTER_OPTS dictionary is disabled. This takes precedence over the default in grains/core.py which would only take effect if the enable_gpu_grains setting was not specified at all.

This commit updates the documentation rather than change the defaults of Salt itself. Note that this commit effectively reverts #24163 which doesn't appear to have factored in the default set in DEFAULT_MASTER_OPTS.

What issues does this PR fix or reference?

None

Tests written?

N/A

Commits signed with GPG?

Yes

Update documentation to correctly state enable_gpu_grains default
While the relevant code in grains/core.py does enable GPU grains by
default, the default in config/__init__.py for the DEFAULT_MASTER_OPTS
dictionary is disabled. This takes precedence over the default in
grains/core.py which would only take effect if the enable_gpu_grains
setting was not specified at all.

@cachedout cachedout merged commit 65205a4 into saltstack:2017.7 Aug 18, 2018

5 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 running py3-ubuntu-1604...
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job 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
@terminalmage

This comment has been minimized.

Copy link
Contributor

commented Aug 28, 2018

This is an incorrect change. The config stub for the master governs master grains, and enable_gpu_grains is set to to False, so this option would be disabled when compiling grains for the master. Grains are compiled on the master via the MasterMinion class, which provides an interface to things like execution modules, which normally run on a minion, to code that runs on the master (for example, in some runner functions).

It seems you have confused this with the minion, which because it does not have a default value set in the DEFAULT_MINION_OPTS, will default to enabling this config option.

@terminalmage terminalmage referenced this pull request Aug 28, 2018

Merged

Revert PR #49185 #49375

@terminalmage

This comment has been minimized.

Copy link
Contributor

commented Aug 28, 2018

This PR has been reverted and corrected via #49375

@ralish

This comment has been minimized.

Copy link
Contributor Author

commented Aug 28, 2018

My apologies @terminalmage and thanks for correcting my mistake!

rallytime added a commit that referenced this pull request Aug 29, 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.