Merge pull request #27027 from rallytime/bp-27013

Back-port #27013 to 2015.5
This commit is contained in:
Justin Findlay 2015-09-10 15:13:52 -06:00
commit 9ab2cae1e4

View file

@ -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