Merge ~mgerdts/cloud-init:lp1763511 into cloud-init:master

Proposed by Mike Gerdts
Status: Merged
Approved by: Scott Moser
Approved revision: d58c20cf3211b477be46390e47253f777999b5b2
Merge reported by: Scott Moser
Merged at revision: 025ddc0329d9314f131cea35075734916797b439
Proposed branch: ~mgerdts/cloud-init:lp1763511
Merge into: cloud-init:master
Diff against target: 35 lines (+3/-3)
2 files modified
cloudinit/sources/ (+1/-1)
doc/examples/cloud-config-disk-setup.txt (+2/-2)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Scott Moser Approve
Review via email:

Commit message

DataSourceSmartOS: change default fs on ephemeral disk from ext3 to ext4.

ext3 is not able to support file system sizes that are needed in Joyent's
cloud. For the default block size of 4k, the maximum filesystem size
for ext3 is 2^32 * 4096 = 16 TiB.

This changes the default file system type from ext3 to ext4.

LP: #1763511

To post a comment you must log in.
Revision history for this message
Mike Gerdts (mgerdts) wrote :

The device_aliases change in the documentation makes it so that documentation matches reality. Pre-existing code made the default ephemeral disk /dev/vdb.

Revision history for this message
Scott Moser (smoser) :
review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:

review: Approve (continuous-integration)
Revision history for this message
Scott Moser (smoser) wrote :

An upstream commit landed for this bug.

To view that commit see the following URL:

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/sources/ b/cloudinit/sources/
2index 86bfa5d..5dd8a12 100644
3--- a/cloudinit/sources/
4+++ b/cloudinit/sources/
5@@ -108,7 +108,7 @@ BUILTIN_CLOUD_CONFIG = {
6 'overwrite': False}
7 },
8 'fs_setup': [{'label': 'ephemeral0',
9- 'filesystem': 'ext3',
10+ 'filesystem': 'ext4',
11 'device': 'ephemeral0'}],
12 }
14diff --git a/doc/examples/cloud-config-disk-setup.txt b/doc/examples/cloud-config-disk-setup.txt
15index dd91477..43a62a2 100644
16--- a/doc/examples/cloud-config-disk-setup.txt
17+++ b/doc/examples/cloud-config-disk-setup.txt
18@@ -37,7 +37,7 @@ fs_setup:
19 # Default disk definitions for SmartOS
20 # ------------------------------------
22-device_aliases: {'ephemeral0': '/dev/sdb'}
23+device_aliases: {'ephemeral0': '/dev/vdb'}
24 disk_setup:
25 ephemeral0:
26 table_type: mbr
27@@ -46,7 +46,7 @@ disk_setup:
29 fs_setup:
30 - label: ephemeral0
31- filesystem: ext3
32+ filesystem: ext4
33 device: ephemeral0.0
35 # Cavaut for SmartOS: if ephemeral disk is not defined, then the disk will


People subscribed via source and target branches