Skip to content

Commit

Permalink
Fix #2132
Browse files Browse the repository at this point in the history
  • Loading branch information
thatch45 committed Sep 30, 2012
1 parent 2f48e4c commit 3e2ee75
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions salt/modules/ca.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@
import time
import logging
import hashlib
import OpenSSL

has_ssl = False
try:
import OpenSSL
has_ssl = True
except ImportError:
pass

# Import Salt libs
from salt.exceptions import CommandExecutionError
Expand All @@ -30,7 +36,9 @@ def __virtual__():
'''
Only load this module if the ca config options are set
'''
return 'ca'
if has_ssl:
return 'ca'
return False


def _cert_base_path():
Expand Down

0 comments on commit 3e2ee75

Please sign in to comment.