mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #27027 from rallytime/bp-27013
Back-port #27013 to 2015.5
This commit is contained in:
commit
9ab2cae1e4
1 changed files with 0 additions and 1 deletions
|
@ -462,7 +462,6 @@ def get_ca_bundle(opts=None):
|
|||
|
||||
# Check Salt first
|
||||
for salt_root in file_roots.get('base', []):
|
||||
log.debug('file_roots is {0}'.format(salt_root))
|
||||
for path in ('cacert.pem', 'ca-bundle.crt'):
|
||||
if os.path.exists(path):
|
||||
return path
|
||||
|
|
Loading…
Add table
Reference in a new issue