diff options
| author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-12 21:03:51 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-12 21:03:51 +0200 |
| commit | 3ece03a2df95bdb40851b9d629b39c43a233868b (patch) | |
| tree | d03940bdba2d0e6051f2f48f84096e495bd11cab | |
| parent | 9c098751b8065da609566572a7badd0d66c2b6ba (diff) | |
| download | vyos-cloud-init-3ece03a2df95bdb40851b9d629b39c43a233868b.tar.gz vyos-cloud-init-3ece03a2df95bdb40851b9d629b39c43a233868b.zip | |
alphabetical import order
| -rw-r--r-- | doc/examples/cloud-config.txt | 3 | ||||
| -rw-r--r-- | tests/unittests/test_handler/test_handler_apt_source.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt index 75a4b6d4..8adc5a96 100644 --- a/doc/examples/cloud-config.txt +++ b/doc/examples/cloud-config.txt @@ -144,6 +144,9 @@ apt_sources: # this would only import the key without adding a ppa or other source spec - keyid: F430BBA5 # GPG key ID published on a key server + # In general keyid's can also be specified via their long fingerprints + - keyid: B59D 5F15 97A5 04B7 E230 6DCA 0620 BBCF 0368 3F77 + # Custom apt repository: # * The apt signing key can also be specified # by providing a pgp public key block diff --git a/tests/unittests/test_handler/test_handler_apt_source.py b/tests/unittests/test_handler/test_handler_apt_source.py index 88b4ccc6..439bd038 100644 --- a/tests/unittests/test_handler/test_handler_apt_source.py +++ b/tests/unittests/test_handler/test_handler_apt_source.py @@ -2,17 +2,17 @@ Testing various config variations of the apt_source config """ import os +import re import shutil import tempfile -import re try: from unittest import mock except ImportError: import mock -from cloudinit import util from cloudinit.config import cc_apt_configure +from cloudinit import util from ..helpers import TestCase |