summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2010-06-17 22:06:24 -0400
committerScott Moser <smoser@ubuntu.com>2010-06-17 22:06:24 -0400
commit257da18b16434360e656fe1ef94e4cf8ba3a5210 (patch)
treedce681c684a199e7b4d1d16f1c165af23b132718
parent245ec190d1cd22f415cfae7f16c875ad49b0d81c (diff)
downloadvyos-cloud-init-257da18b16434360e656fe1ef94e4cf8ba3a5210.tar.gz
vyos-cloud-init-257da18b16434360e656fe1ef94e4cf8ba3a5210.zip
cloud.cfg: remove accidently commited 'cloud_config_modules' section
remove the section, these should be covered in 'builtin'. The content was correct, just not needed. Added an example to doc/examples/cloud-config.txt on how the user can configure this from either cloud-config user data or from /etc/cloud/cloud.cfg
-rw-r--r--cloud.cfg8
-rw-r--r--doc/examples/cloud-config.txt30
2 files changed, 30 insertions, 8 deletions
diff --git a/cloud.cfg b/cloud.cfg
index 3509f5b4..898a8b62 100644
--- a/cloud.cfg
+++ b/cloud.cfg
@@ -1,11 +1,3 @@
cloud_type: auto
user: ubuntu
disable_root: 1
-
-cloud_config_modules:
- - apt-update-upgrade
- - config-misc
- - config-mounts
- - config-puppet
- - config-ssh
- - disable-ec2-metadata
diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt
index 510c1b5e..1bde5b10 100644
--- a/doc/examples/cloud-config.txt
+++ b/doc/examples/cloud-config.txt
@@ -175,3 +175,33 @@ runcmd:
- [ sh, -c, echo "=========hello world'=========" ]
- ls -l /root
- [ wget, "http://slashdot.org", -O, /tmp/index.html ]
+
+
+# cloud_config_modules:
+# default:
+# cloud_config_modules:
+# - mounts
+# - ssh
+# - apt-update-upgrade
+# - puppet
+# - updates-check
+# - disable-ec2-metadata
+# - runcmd
+#
+# This is an array of arrays or strings.
+# if item is a string, then it is read as a module name
+# if the item is an array it is of the form:
+# name, frequency, arguments
+# where 'frequency' is one of:
+# once-per-instance
+# always
+# a python file in the CloudConfig/ module directory named
+# cloud_config_name.py
+# example:
+cloud_config_modules:
+ - [apt-update-upgrade, always]
+ - config-misc
+ - config-mounts
+ - config-puppet
+ - config-ssh
+ - disable-ec2-metadata