summaryrefslogtreecommitdiff
path: root/doc/examples
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-02-13 06:27:22 -0500
committerScott Moser <smoser@ubuntu.com>2014-02-13 06:27:22 -0500
commitc722a6e9110b8a5dc33de8911cf5734e14dc523f (patch)
tree54acbaf93371fc42f2777f68e79768e45f47a0a7 /doc/examples
parent5788cd903f6e4a9bab2ad32e9c1d2eb13b485ac3 (diff)
parentf7ac086a434b511b076346839818de7cf34e18a2 (diff)
downloadvyos-cloud-init-c722a6e9110b8a5dc33de8911cf5734e14dc523f.tar.gz
vyos-cloud-init-c722a6e9110b8a5dc33de8911cf5734e14dc523f.zip
merge from trunk
Diffstat (limited to 'doc/examples')
-rw-r--r--doc/examples/cloud-config-landscape.txt8
-rw-r--r--doc/examples/cloud-config.txt10
2 files changed, 14 insertions, 4 deletions
diff --git a/doc/examples/cloud-config-landscape.txt b/doc/examples/cloud-config-landscape.txt
index 74e07b62..d7ff8ef8 100644
--- a/doc/examples/cloud-config-landscape.txt
+++ b/doc/examples/cloud-config-landscape.txt
@@ -16,7 +16,7 @@ landscape:
data_path: "/var/lib/landscape/client"
http_proxy: "http://my.proxy.com/foobar"
tags: "server,cloud"
- computer_title = footitle
- https_proxy = fooproxy
- registration_key = fookey
- account_name = fooaccount
+ computer_title: footitle
+ https_proxy: fooproxy
+ registration_key: fookey
+ account_name: fooaccount
diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt
index 61fa6065..ed4eb7fc 100644
--- a/doc/examples/cloud-config.txt
+++ b/doc/examples/cloud-config.txt
@@ -319,6 +319,16 @@ cloud_config_modules:
- runcmd
- byobu
+# unverified_modules: []
+# if a config module declares a set of distros as supported then it will be
+# skipped if running on a different distro. to override this sanity check,
+# provide a list of modules that should be run anyway in 'unverified_modules'.
+# The default is an empty list (ie, trust modules).
+#
+# Example:
+# unverified_modules: ['apt-update-upgrade']
+# default: []
+
# ssh_import_id: [ user1, user2 ]
# ssh_import_id will feed the list in that variable to
# ssh-import-id, so that public keys stored in launchpad