saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Load core grains only if required.

Browse source 
As per discussion on github, these grains should only be loaded if
absolutely required.
This commit is contained in:
Michael Lustfield 2017-01-25 12:24:20 -06:00
parent 4966011cb5
commit 73a8c6d121
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/config/__init__.py
View file

@ -15,7 +15,6 @@ import codecs
import logging
from copy import deepcopy
import types
import platform
# Import third party libs
import yaml
@ -41,7 +40,6 @@ import salt.utils.xdg
import salt.exceptions
from salt.utils.locales import sdecode
import salt.defaults.exitcodes
import salt.grains.core
try:
import psutil
@ -80,6 +78,9 @@ def _gather_buffer_space():
# Oh good, we have psutil. This will be quick.
total_mem = psutil.virtual_memory().total
else:
# Avoid loading core grains unless absolutely required
import platform
import salt.grains.core
# We need to load up ``mem_total`` grain. Let's mimic required OS data.
os_data = {'kernel': platform.system()}
grains = salt.grains.core._memdata(os_data)