diff options
author | Ben Howard <ben.howard@canonical.com> | 2013-10-02 15:05:15 -0600 |
---|---|---|
committer | Ben Howard <ben.howard@canonical.com> | 2013-10-02 15:05:15 -0600 |
commit | ea88f3e1208ba501b50d1f41187b83cf11f15785 (patch) | |
tree | a1c1ea966d8ed38670968d809dba88750cc4cd96 /cloudinit/sources/DataSourceAzure.py | |
parent | ed8cb662f72e4e3e03ee0489593b7d114e5618cf (diff) | |
download | vyos-cloud-init-ea88f3e1208ba501b50d1f41187b83cf11f15785.tar.gz vyos-cloud-init-ea88f3e1208ba501b50d1f41187b83cf11f15785.zip |
Added ability to define disks via 'ephemeralX.Y'.
Modified cc_mounts to identify whether ephermalX is partitioned.
Changed datasources for Azure and SmartOS to use 'ephemeralX.Y' format.
Added disk remove functionally
Diffstat (limited to 'cloudinit/sources/DataSourceAzure.py')
-rw-r--r-- | cloudinit/sources/DataSourceAzure.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index 7ba6cea8..b7de0187 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -54,8 +54,9 @@ BUILTIN_CLOUD_CONFIG = { 'layout': True, 'overwrite': False} }, - 'fs_setup': [{'filesystem': 'ext4', 'device': 'ephemeral0', - 'partition': 'auto'}], + 'fs_setup': [{'filesystem': 'ext4', + 'device': 'ephemeral0.1', + 'replace_fs': 'ntfs'}] } DS_CFG_PATH = ['datasource', DS_NAME] @@ -176,7 +177,9 @@ class DataSourceAzureNet(sources.DataSource): return True def device_name_to_device(self, name): - return self.ds_cfg['disk_aliases'].get(name) + device = name.split('.')[0] + return util.map_device_alias(self.ds_cfg['disk_aliases'].get(device), + alias=name) def get_config_obj(self): return self.cfg |