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

When using the vault module on a 2018.3 minion against a 2017.7 master, the 2018.3 minion is expecting a verify element in the results from the Salt runner on the master. The runner in 2017.7 did not include a verify element, which results in an error. This change accounts for this by using the default in 2018.3 which is not to verify if not configured.

Browse source
This commit is contained in:
Gareth J. Greenaway 2018-04-20 18:25:45 -07:00
parent 1947ffdf56
commit 1758081ffe
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/vault.py
View file

@ -87,7 +87,7 @@ def _get_token_and_url_from_master():
return {
'url': result['url'],
'token': result['token'],
'verify': result['verify'],
'verify': result.get('verify', None),
}