diff options
| author | Ben Howard <ben.howard@canonical.com> | 2013-10-03 16:15:56 -0600 |
|---|---|---|
| committer | Ben Howard <ben.howard@canonical.com> | 2013-10-03 16:15:56 -0600 |
| commit | ecf2a600e41a9632ad305eb6a8cd5665908f31fb (patch) | |
| tree | dd8539cba663a5662187d7b68b49252d9877ca3e /cloudinit/sources | |
| parent | c3daa2fa160c930084509f4ef5abfbb562b7059d (diff) | |
| download | vyos-cloud-init-ecf2a600e41a9632ad305eb6a8cd5665908f31fb.tar.gz vyos-cloud-init-ecf2a600e41a9632ad305eb6a8cd5665908f31fb.zip | |
Moved ephemeralX.Y handling from Datasource into the cc_disk_setup, which makes it cloud agnostic.
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/DataSourceAzure.py | 4 | ||||
| -rw-r--r-- | cloudinit/sources/DataSourceSmartOS.py | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index b7de0187..8321dee0 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -177,9 +177,7 @@ class DataSourceAzureNet(sources.DataSource): return True def device_name_to_device(self, name): - device = name.split('.')[0] - return util.map_device_alias(self.ds_cfg['disk_aliases'].get(device), - alias=name) + return self.ds_cfg['disk_aliases'].get(name) def get_config_obj(self): return self.cfg diff --git a/cloudinit/sources/DataSourceSmartOS.py b/cloudinit/sources/DataSourceSmartOS.py index 9b3fdf1a..666129ec 100644 --- a/cloudinit/sources/DataSourceSmartOS.py +++ b/cloudinit/sources/DataSourceSmartOS.py @@ -156,9 +156,7 @@ class DataSourceSmartOS(sources.DataSource): return True def device_name_to_device(self, name): - device = name.split('.')[0] - return util.map_device_alias(self.ds_cfg['disk_aliases'].get(device), - alias=name) + return self.ds_cfg['disk_aliases'].get(name) def get_config_obj(self): return self.cfg |