From d1b7fb449c479b22eab17e32196bd4b7f1b017b9 Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Tue, 28 Aug 2018 11:17:32 -0500 Subject: [PATCH] Revert "Update documentation to correctly state enable_gpu_grains default" This reverts commit 2fe675cfdd86ba370f3eec70dd50d149a70d04e5. --- 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 f235abc072b..e88aa578c7c 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: True +# enable_gpu_grains: False # 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 5f7f16fb4d9..e0a51c000fb 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: True +# enable_gpu_grains: False # 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 4703af96e30..3dedd13dae2 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: \fBFalse\fP +Default: \fBTrue\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 @@ -14347,7 +14347,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: True +# enable_gpu_grains: False # 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 3829b963938..5105f954ecc 100644 --- a/doc/ref/configuration/master.rst +++ b/doc/ref/configuration/master.rst @@ -440,7 +440,7 @@ communication. ``enable_gpu_grains`` --------------------- -Default: ``False`` +Default: ``True`` 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