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

Add support for both keyserver and keyring in apt_key

Browse source 
Fixes Issue #2996
This commit is contained in:
callipeo 2016-02-09 19:51:16 +01:00 committed by Matt Clay
parent ce7a86b4ce
commit 4331fcae34
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/packaging/os/apt_key.py
View file

@ -166,7 +166,10 @@ def download_key(module, url):
except Exception: except Exception:
module.fail_json(msg="error getting key id from url: %s" % url, traceback=format_exc()) module.fail_json(msg="error getting key id from url: %s" % url, traceback=format_exc())
def import_key(module, keyserver, key_id): def import_key(module, keyring, keyserver, key_id):
if keyring:
cmd = "apt-key --keyring %s adv --keyserver %s --recv %s" % (keyring, keyserver, key_id)
else:
cmd = "apt-key adv --keyserver %s --recv %s" % (keyserver, key_id) cmd = "apt-key adv --keyserver %s --recv %s" % (keyserver, key_id)
(rc, out, err) = module.run_command(cmd, check_rc=True) (rc, out, err) = module.run_command(cmd, check_rc=True)
return True return True
@ -253,7 +256,7 @@ def main():
if filename: if filename:
add_key(module, filename, keyring) add_key(module, filename, keyring)
elif keyserver: elif keyserver:
import_key(module, keyserver, key_id) import_key(module, keyring, keyserver, key_id)
else: else:
add_key(module, "-", keyring, data) add_key(module, "-", keyring, data)
changed=False changed=False