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

Merge pull request #27727 from rallytime/merge-27719

Browse source 
Merge #27719 w/pylint fix
This commit is contained in:
Nicole Thomas 2015-10-06 15:13:37 -06:00
commit d3f2dfe835
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/x509.py
View file

@ -63,10 +63,13 @@ CERT_DEFAULTS = {'days_valid': 365, 'version': 3, 'serial_bits': 64, 'algorithm'
def __virtual__():
'''
only load this module if m2crypto is available
'''
if HAS_M2:
return __virtualname__
else:
return False
return (False, 'Could not load x509 module, m2crypto unavailable')
class _Ctx(ctypes.Structure):

10
salt/states/x509.py
View file

@ -169,6 +169,16 @@ import salt.utils
import salt.ext.six as six
def __virtual__():
'''
only load this module if the corresponding execution module is loaded
'''
if 'x509.get_pem_entry' in __salt__:
return 'x509'
else:
return (False, 'Could not load x509 state: m2crypto unavailable')
def _revoked_to_list(revs):
'''
Turn the mess of OrderedDicts and Lists into a list of dicts for