diff options
| -rw-r--r-- | cloudinit/config/cc_apt_configure.py | 15 | ||||
| -rw-r--r-- | doc/examples/cloud-config-apt.txt | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py index c3c48bbd..86d0feae 100644 --- a/cloudinit/config/cc_apt_configure.py +++ b/cloudinit/config/cc_apt_configure.py @@ -36,14 +36,14 @@ frequency = PER_INSTANCE distros = ["ubuntu", "debian"] mirror_property = { 'type': 'array', - 'item': { + 'items': { 'type': 'object', 'additionalProperties': False, 'required': ['arches'], 'properties': { 'arches': { 'type': 'array', - 'item': { + 'items': { 'type': 'string' }, 'minItems': 1 @@ -54,7 +54,7 @@ mirror_property = { }, 'search': { 'type': 'array', - 'item': { + 'items': { 'type': 'string', 'format': 'uri' }, @@ -113,11 +113,12 @@ schema = { search: - 'http://cool.but-sometimes-unreachable.com/ubuntu' - 'http://us.archive.ubuntu.com/ubuntu' - search_dns: <true/false> + search_dns: false - arches: - s390x - arm64 uri: 'http://archive-to-use-for-arm64.example.com/ubuntu' + security: - arches: - default @@ -260,7 +261,8 @@ schema = { ``http://archive.ubuntu.com/ubuntu``. - ``security`` => \ ``http://security.ubuntu.com/ubuntu`` - """)}, + """) + }, 'security': { **mirror_property, 'description': dedent("""\ @@ -380,6 +382,7 @@ schema = { - ``key``: a raw PGP key. - ``keyserver``: alternate keyserver to pull \ ``keyid`` key from. + - ``filename``: specify the name of the .list file The ``source`` key supports variable replacements for the following strings: @@ -1040,7 +1043,7 @@ def get_arch_mirrorconfig(cfg, mirrortype, arch): # select the specification matching the target arch default = None for mirror_cfg_elem in mirror_cfg_list: - arches = mirror_cfg_elem.get("arches", []) + arches = mirror_cfg_elem.get("arches") or [] if arch in arches: return mirror_cfg_elem if "default" in arches: diff --git a/doc/examples/cloud-config-apt.txt b/doc/examples/cloud-config-apt.txt index 7baa141c..778187b5 100644 --- a/doc/examples/cloud-config-apt.txt +++ b/doc/examples/cloud-config-apt.txt @@ -149,7 +149,7 @@ apt: # security is optional, if not defined it is set to the same value as primary security: - uri: http://security.ubuntu.com/ubuntu - - arches: [default] + arches: [default] # If search_dns is set for security the searched pattern is: # <distro>-security-mirror |