valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Using salt util function to determine if OS X

Browse Source
This commit is contained in:
Daniel Hobley 2016-01-29 11:53:48 +01:00
parent bae0543d95
commit 269ba6088a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/mac_keychain.py
View File

@ -8,6 +8,8 @@ Install certificates into the keychain on Mac OS
import logging
# Import salt libs
import salt.utils
log = logging.getLogger(__name__)
__virtualname__ = 'keychain'
@ -16,7 +18,7 @@ def __virtual__():
'''
Only work on Mac OS
'''
if __grains__['os'] in ['MacOS', 'Darwin']:
if salt.utils.is_darwin():
return __virtualname__
return False

4
salt/states/mac_keychain.py
View File

@ -17,15 +17,17 @@ import logging
import os
# Import salt libs
import salt.utils
log = logging.getLogger(__name__)
__virtualname__ = 'keychain'
def __virtual__():
'''
Only work on Mac OS
'''
if __grains__['os'] in ['MacOS', 'Darwin']:
if salt.utils.is_darwin():
return __virtualname__
return False