diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-09-27 16:04:35 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-09-27 16:04:35 -0400 |
| commit | d8146440c9c67d52871c1743cdbad4f08697fc27 (patch) | |
| tree | 903453e229d767c72a5f5ba81e00c8c2f2e7c0ca | |
| parent | 1c79f38fb2a9d11a0ab7743cf5d2965b2c3cbd56 (diff) | |
| parent | 2c8c4c25adf2d75c6a769fa8b05151716ea4a98c (diff) | |
| download | vyos-cloud-init-d8146440c9c67d52871c1743cdbad4f08697fc27.tar.gz vyos-cloud-init-d8146440c9c67d52871c1743cdbad4f08697fc27.zip | |
merge from ben. disable partition creation on smartos
| -rw-r--r-- | cloudinit/sources/DataSourceSmartOS.py | 2 | ||||
| -rw-r--r-- | doc/examples/cloud-config-disk-setup.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceSmartOS.py b/cloudinit/sources/DataSourceSmartOS.py index fa26633a..93b8b50b 100644 --- a/cloudinit/sources/DataSourceSmartOS.py +++ b/cloudinit/sources/DataSourceSmartOS.py @@ -78,7 +78,7 @@ BUILTIN_DS_CONFIG = { BUILTIN_CLOUD_CONFIG = { 'disk_setup': { 'ephemeral0': {'table_type': 'mbr', - 'layout': True, + 'layout': False, 'overwrite': False} }, 'fs_setup': [{'label': 'ephemeral0', 'filesystem': 'ext3', diff --git a/doc/examples/cloud-config-disk-setup.txt b/doc/examples/cloud-config-disk-setup.txt index c108d924..19698492 100644 --- a/doc/examples/cloud-config-disk-setup.txt +++ b/doc/examples/cloud-config-disk-setup.txt @@ -41,7 +41,7 @@ device_aliases: {'ephemeral0': '/dev/sdb'} disk_setup: ephemeral0: type: mbr - layout: True + layout: False overwrite: False fs_setup: |