cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix lxd_container module fails if certificate already in trust store

Browse source 
When the client certificate is already stored, lxd returns a JSON error with message "Certificate already in trust store". This "error" will occur on every task run after the initial run. The cert should be in the trust store after the first run and this error message should really only be viewed as informational as it does not indicate a real problem.

Fixes:
ansible/ansible-modules-extras#2750
(cherry picked from commit 1f30bc8a6f)
This commit is contained in:
Will 2016-10-24 20:40:04 -07:00 committed by Toshio Kuratomi
parent 96d3f06743
commit 731422a6dc
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/lxd.py
View file

@ -121,6 +121,8 @@ class LXDClient(object):
if resp_type == 'error': if resp_type == 'error':
if ok_error_codes is not None and resp_json['error_code'] in ok_error_codes: if ok_error_codes is not None and resp_json['error_code'] in ok_error_codes:
return resp_json return resp_json
if resp_json['error'] == "Certificate already in trust store":
return resp_json
self._raise_err_from_json(resp_json) self._raise_err_from_json(resp_json)
return resp_json return resp_json
except socket.error as e: except socket.error as e: