cloud-init-dev team mailing list archive

[Felix Dreissig <f30@xxxxxx>]

Felix Dreissig has proposed merging ~f30/cloud-init:apt-uri-url into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~f30/cloud-init/+git/cloud-init/+merge/323432

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.
-- 
Your team cloud init development team is requested to review the proposed merge of ~f30/cloud-init:apt-uri-url into cloud-init:master.

diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 7e75177..f6885d7 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -65,12 +65,12 @@ take a list of configs, allowing mirrors to be specified on a per-architecture
 basis. Each config is a dictionary which must have an entry for ``arches``,
 specifying which architectures that config entry is for. The keyword
 ``default`` applies to any architecture not explicitly listed. The mirror url
-can be specified with the ``url`` key, or a list of mirrors to check can be
+can be specified with the ``uri`` key, or a list of mirrors to check can be
 provided in order, with the first mirror that can be resolved being selected.
 This allows the same configuration to be used in different environment, with
-different hosts used for a local apt mirror. If no mirror is provided by uri or
-search, ``search_dns`` may be used to search for dns names in the format
-``<distro>-mirror`` in each of the following:
+different hosts used for a local apt mirror. If no mirror is provided by
+``uri`` or ``search``, ``search_dns`` may be used to search for dns names in
+the format ``<distro>-mirror`` in each of the following:
 
     - fqdn of this host per cloud metadata
     - localdomain