diff options
| author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-06-09 09:18:35 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-06-09 09:18:35 +0200 |
| commit | b89ac6b7caeeade5ad21137773ac4496cdaea2c5 (patch) | |
| tree | 8cc479ca22be1ae12d99e3c18376c1d51414010f /cloudinit/config | |
| parent | 3a51f0df3270a70a130b0dea7d3410b4742dcb2a (diff) | |
| download | vyos-cloud-init-b89ac6b7caeeade5ad21137773ac4496cdaea2c5.tar.gz vyos-cloud-init-b89ac6b7caeeade5ad21137773ac4496cdaea2c5.zip | |
move gpg functions into gpg.py
This helps for cleaner code structuring.
ALong that makeing sure all these functions have a gpg_prefix.
Diffstat (limited to 'cloudinit/config')
| -rw-r--r-- | cloudinit/config/cc_apt_configure.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py index be6324a2..ba080930 100644 --- a/cloudinit/config/cc_apt_configure.py +++ b/cloudinit/config/cc_apt_configure.py @@ -24,6 +24,7 @@ import re from cloudinit import templater from cloudinit import util +from cloudinit import gpg distros = ['ubuntu', 'debian'] @@ -167,7 +168,7 @@ def add_apt_key(ent): keyserver = "keyserver.ubuntu.com" if 'keyserver' in ent: keyserver = ent['keyserver'] - ent['key'] = util.getkeybyid(ent['keyid'], keyserver) + ent['key'] = gpg.gpg_getkeybyid(ent['keyid'], keyserver) if 'key' in ent: add_apt_key_raw(ent['key']) |