From 2fe675cfdd86ba370f3eec70dd50d149a70d04e5 Mon Sep 17 00:00:00 2001 From: "Samuel D. Leslie" Date: Sat, 18 Aug 2018 13:44:24 +1000 Subject: [PATCH] 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. --- conf/master | 2 +- conf/suse/master | 2 +- doc/man/salt.7 | 4 ++-- doc/ref/configuration/master.rst | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/master b/conf/master index abfc1fa8088..b0ce65423a1 100644 --- a/conf/master +++ b/conf/master @@ -125,7 +125,7 @@ # The master can take a while to start up when lspci and/or dmidecode is used # to populate the grains for the master. Enable if you want to see GPU hardware # data for your master. -# enable_gpu_grains: False +# enable_gpu_grains: True # The master maintains a job cache. While this is a great addition, it can be # a burden on the master for larger deployments (over 5000 minions). diff --git a/conf/suse/master b/conf/suse/master index aeaa1d88591..b738ba571c3 100644 --- a/conf/suse/master +++ b/conf/suse/master @@ -127,7 +127,7 @@ syndic_user: salt # The master can take a while to start up when lspci and/or dmidecode is used # to populate the grains for the master. Enable if you want to see GPU hardware # data for your master. -# enable_gpu_grains: False +# enable_gpu_grains: True # The master maintains a job cache. While this is a great addition, it can be # a burden on the master for larger deployments (over 5000 minions). diff --git a/doc/man/salt.7 b/doc/man/salt.7 index aeb69051f38..5d34e8ed11f 100644 --- a/doc/man/salt.7 +++ b/doc/man/salt.7 @@ -5261,7 +5261,7 @@ sock_dir: /var/run/salt/master .UNINDENT .SS \fBenable_gpu_grains\fP .sp -Default: \fBTrue\fP +Default: \fBFalse\fP .sp Enable GPU hardware data for your master. Be aware that the master can take a while to start up when lspci and/or dmidecode is used to populate the @@ -14366,7 +14366,7 @@ and \fBmine_functions\fP\&. # The master can take a while to start up when lspci and/or dmidecode is used # to populate the grains for the master. Enable if you want to see GPU hardware # data for your master. -# enable_gpu_grains: False +# enable_gpu_grains: True # The master maintains a job cache. While this is a great addition, it can be # a burden on the master for larger deployments (over 5000 minions). diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst index f243ad887bd..6fa7b0e92bf 100644 --- a/doc/ref/configuration/master.rst +++ b/doc/ref/configuration/master.rst @@ -440,7 +440,7 @@ communication. ``enable_gpu_grains`` --------------------- -Default: ``True`` +Default: ``False`` Enable GPU hardware data for your master. Be aware that the master can take a while to start up when lspci and/or dmidecode is used to populate the