From d1bad8880c2219b9d7a648169bbe7a0a27c03be2 Mon Sep 17 00:00:00 2001
From: Ben Howard <ben.howard@canonical.com>
Date: Thu, 19 Sep 2013 16:49:50 -0600
Subject: 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.
---
 config/cloud.cfg | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'config/cloud.cfg')

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
-- 
cgit v1.2.3