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 #42484 from shengis/fix-explicit-error-msg-x509-sign-remote

Browse source 
Fix a potential Exception with an explicit error message
This commit is contained in:
Mike Place 2017-07-25 13:34:11 -05:00 • committed by GitHub
commit df417eae17
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/modules/x509.py
View file

@ -1373,10 +1373,19 @@ def create_certificate(
['listen_in', 'preqrequired', '__prerequired__']:
kwargs.pop(ignore, None)
cert_txt = __salt__['publish.publish'](
certs = __salt__['publish.publish'](
tgt=ca_server,
fun='x509.sign_remote_certificate',
arg=str(kwargs))[ca_server]
arg=str(kwargs))
if not any(certs):
raise salt.exceptions.SaltInvocationError(
'ca_server did not respond'
' salt master must permit peers to'
' call the sign_remote_certificate function.')
cert_txt = certs[ca_server]
if path:
return write_pem(
text=cert_txt,