summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorBen Howard <ben.howard@canonical.com>2013-09-19 16:49:50 -0600
committerBen Howard <ben.howard@canonical.com>2013-09-19 16:49:50 -0600
commitd1bad8880c2219b9d7a648169bbe7a0a27c03be2 (patch)
tree3080345395538f215cea2708982acbc408ead6ba /config
parent23f7b8a39bb197db557bdcf851639ea4111b7786 (diff)
downloadvyos-cloud-init-d1bad8880c2219b9d7a648169bbe7a0a27c03be2.tar.gz
vyos-cloud-init-d1bad8880c2219b9d7a648169bbe7a0a27c03be2.zip
Fixes for the MP.
Changed cc_disk_setup to handle the file systems as a label, no longer passing "log" around. Tidied up the documentation to reflect the changes and made grammer, spelling and improved the content a little. Added disk_setup to the default modules list.
Diffstat (limited to 'config')
-rw-r--r--config/cloud.cfg15
1 files changed, 1 insertions, 14 deletions
diff --git a/config/cloud.cfg b/config/cloud.cfg
index 8b52ca39..382cfaf8 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -14,20 +14,6 @@ disable_root: true
# This will cause the set+update hostname module to not operate (if true)
preserve_hostname: false
-# This sets the default for creating the ephemeral0 on clouds
-# that support it.
-disk_setup:
- ephemeral0
- type: 'mbr'
- layout: True
- overwrite: False
-
-fs_setup:
- ephemeral0
- filesystem: 'ext3'
- device: ephemeral0
- partition: 'auto'
-
# Example datasource config
# datasource:
# Ec2:
@@ -56,6 +42,7 @@ cloud_config_modules:
# Emit the cloud config ready event
# this can be used by upstart jobs for 'start on cloud-config'.
- emit_upstart
+ - disk_setup
- mounts
- ssh-import-id
- locale