Merge ~mwhudson/curtin:no-dasds-in-get_path_to_storage_volume into curtin:master

Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: 38f06653b7b288945f74ba57ca36d6496877e4e4
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~mwhudson/curtin:no-dasds-in-get_path_to_storage_volume
Merge into: curtin:master
Diff against target: 15 lines (+0/-4)
1 file modified
curtin/commands/block_meta.py (+0/-4)
Reviewer Review Type Date Requested Status
Dimitri John Ledkov (community) Approve
Server Team CI bot continuous-integration Approve
curtin developers Pending
Review via email: mp+393794@code.launchpad.net

Commit message

remove support for calling get_path_to_storage_volume on a dasd action

there is no code path that will do this today, and this implementation
will not work with some changes I want to make to support dasds passed
via virtio.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

my understanding was that in the storage config we emit two volumes - one of type dasd, and another of type disk. Plus partitions.

Such that storage look ups should be only done on the disk/partitions, and not on the type dasd.

I guess, this was added because of supporting api for all the things.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/curtin/commands/block_meta.py b/curtin/commands/block_meta.py
2index 30fc817..eada650 100644
3--- a/curtin/commands/block_meta.py
4+++ b/curtin/commands/block_meta.py
5@@ -437,10 +437,6 @@ def get_path_to_storage_volume(volume, storage_config):
6 volume_path = block.kname_to_path(partition_kname)
7 devsync_vol = os.path.join(disk_block_path)
8
9- elif vol.get('type') == "dasd":
10- dasd_device = dasd.DasdDevice(vol.get('device_id'))
11- volume_path = dasd_device.devname
12-
13 elif vol.get('type') == "disk":
14 # Get path to block device for disk. Device_id param should refer
15 # to id of device in storage config

Subscribers

People subscribed via source and target branches