Merge ~f30/cloud-init:apt-uri-url into cloud-init:master

Proposed by Felix Dreissig
Status: Merged
Approved by: Scott Moser
Approved revision: 653fda98a56c63d11d65ef08c4991d0425fc3f91
Merged at revision: 653fda98a56c63d11d65ef08c4991d0425fc3f91
Proposed branch: ~f30/cloud-init:apt-uri-url
Merge into: cloud-init:master
Diff against target: 21 lines (+4/-4)
1 file modified
cloudinit/config/cc_apt_configure.py (+4/-4)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
cloud-init Commiters Pending
Review via email: mp+323432@code.launchpad.net

Description of the change

This fixes an annoying typo/inconsistency in the docs for the "cc_apt_configure" module:

The key to specify a mirror URL is called "uri", not "url". This is what's used throughout the examples and also what works in practice (verified on Ubuntu 16.10).
This also slightly improves formatting of the key names in the related documentation.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
2index 7e75177..f6885d7 100644
3--- a/cloudinit/config/cc_apt_configure.py
4+++ b/cloudinit/config/cc_apt_configure.py
5@@ -65,12 +65,12 @@ take a list of configs, allowing mirrors to be specified on a per-architecture
6 basis. Each config is a dictionary which must have an entry for ``arches``,
7 specifying which architectures that config entry is for. The keyword
8 ``default`` applies to any architecture not explicitly listed. The mirror url
9-can be specified with the ``url`` key, or a list of mirrors to check can be
10+can be specified with the ``uri`` key, or a list of mirrors to check can be
11 provided in order, with the first mirror that can be resolved being selected.
12 This allows the same configuration to be used in different environment, with
13-different hosts used for a local apt mirror. If no mirror is provided by uri or
14-search, ``search_dns`` may be used to search for dns names in the format
15-``<distro>-mirror`` in each of the following:
16+different hosts used for a local apt mirror. If no mirror is provided by
17+``uri`` or ``search``, ``search_dns`` may be used to search for dns names in
18+the format ``<distro>-mirror`` in each of the following:
19
20 - fqdn of this host per cloud metadata
21 - localdomain

Subscribers

People subscribed via source and target branches