valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #37902 from gtmanfred/develop

Browse Source 
use opts for metadata grains
This commit is contained in:
Erik Johnson 2016-11-26 16:13:45 -06:00 committed by GitHub
commit 941fb8aa8b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/grains/metadata.py
View File

@ -30,7 +30,7 @@ HOST = 'http://{0}/'.format(IP)
def __virtual__():
if __salt__['config.get']('metadata_server_grains', False) is False:
if __opts__.get('metadata_server_grains', False) is False:
return False
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.settimeout(.1)