summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorSean Bright <sean.bright@gmail.com>2016-11-18 17:15:08 -0500
committerScott Moser <smoser@brickies.net>2016-11-22 13:27:22 -0500
commit7e586f0d4f59a5051f8723e6bbdd06466d19729e (patch)
tree3dac3559f8934ff618b157009b171821b1768995 /cloudinit
parentedd94ebff613fd99768d9287b12d72a9409ae6bc (diff)
downloadvyos-cloud-init-7e586f0d4f59a5051f8723e6bbdd06466d19729e.tar.gz
vyos-cloud-init-7e586f0d4f59a5051f8723e6bbdd06466d19729e.zip
Doc: various documentation fixes
Several various minor fixes for the readthedocs documentation.
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/config/cc_apt_configure.py6
-rw-r--r--cloudinit/config/cc_bootcmd.py2
2 files changed, 5 insertions, 3 deletions
diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 6145fcd2..eb1db707 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -199,6 +199,8 @@ The ``source`` key supports variable replacements for the following strings:
deb-src $MIRROR $RELEASE main restricted
deb $PRIMARY $RELEASE universe restricted
deb $SECURITY $RELEASE-security multiverse
+ debconf_selections:
+ set1: the-package the-package/some-flag boolean true
conf: |
APT {
Get {
@@ -216,9 +218,9 @@ The ``source`` key supports variable replacements for the following strings:
keyserver: "keyserverurl"
source: "deb http://<url>/ xenial main"
source2:
- source "ppa:<ppa-name>"
+ source: "ppa:<ppa-name>"
source3:
- source "deb $MIRROR $RELEASE multiverse"
+ source: "deb $MIRROR $RELEASE multiverse"
key: |
------BEGIN PGP PUBLIC KEY BLOCK-------
<key data>
diff --git a/cloudinit/config/cc_bootcmd.py b/cloudinit/config/cc_bootcmd.py
index 22b23f28..291ac6e2 100644
--- a/cloudinit/config/cc_bootcmd.py
+++ b/cloudinit/config/cc_bootcmd.py
@@ -43,7 +43,7 @@ specified either as lists or strings. For invocation details, see ``runcmd``.
bootcmd:
- echo 192.168.1.130 us.archive.ubuntu.com > /etc/hosts
- - [ cloud-nit-per, once, mymkfs, mkfs, /dev/vdb ]
+ - [ cloud-init-per, once, mymkfs, mkfs, /dev/vdb ]
"""
import os