x/cloud-init
Code Issues Proposed changes

Allow a Config Drive source on a partition, if the label matches.

Browse Source
This commit is contained in:
Paul Querna 2014-01-09 21:14:51 +00:00
parent 1a6ad1d61a
commit 69d9382194
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloudinit/sources/DataSourceConfigDrive.py
View File

@ -284,8 +284,10 @@ def find_candidate_devs():
# followed by fstype items, but with dupes removed # followed by fstype items, but with dupes removed
combined = (by_label + [d for d in by_fstype if d not in by_label]) combined = (by_label + [d for d in by_fstype if d not in by_label])
# We are looking for block device (sda, not sda1), ignore partitions # We are looking for a block device or partition with necessary label or
combined = [d for d in combined if not util.is_partition(d)] # an unpartitioned block device.
combined = [d for d in combined
if d in by_label or not util.is_partition(d)]
return combined return combined

5
tests/unittests/test_datasource/test_configdrive.py
View File

@ -285,10 +285,11 @@ class TestConfigDriveDataSource(MockerTestCase):
self.assertEqual(["/dev/vdb", "/dev/zdd"], self.assertEqual(["/dev/vdb", "/dev/zdd"],
ds.find_candidate_devs()) ds.find_candidate_devs())
# verify that partitions are not considered # verify that partitions are considered, but only if they have a label.
devs_with_answers = {"TYPE=vfat": ["/dev/sda1"], devs_with_answers = {"TYPE=vfat": ["/dev/sda1"],
"TYPE=iso9660": [], "LABEL=config-2": ["/dev/vdb3"]} "TYPE=iso9660": [], "LABEL=config-2": ["/dev/vdb3"]}
self.assertEqual([], ds.find_candidate_devs()) self.assertEqual(["/dev/vdb3"],
ds.find_candidate_devs())
finally: finally:
util.find_devs_with = orig_find_devs_with util.find_devs_with = orig_find_devs_with