summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorFelix Dreissig <f30@f30.me>2017-04-29 16:28:57 +0200
committerFelix Dreissig <f30@f30.me>2017-04-29 16:36:58 +0200
commit653fda98a56c63d11d65ef08c4991d0425fc3f91 (patch)
treed7116377244ffb80f8ce1dd9f378ddd942ae9c70 /cloudinit
parent2796dab3cdd96306be80d6b78b8eec3a23f4d9f4 (diff)
downloadvyos-cloud-init-653fda98a56c63d11d65ef08c4991d0425fc3f91.tar.gz
vyos-cloud-init-653fda98a56c63d11d65ef08c4991d0425fc3f91.zip
Fix name of "uri" key in docs for "cc_apt_configure" module
The key 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.
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/config/cc_apt_configure.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 7e751776..f6885d7c 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