when assembling vg from answers, check devices are ok_for_lvm_vg
And similar for RAID. Fix a couple of the answers files that got this wrong and only worked by chance.
This commit is contained in:
parent
9bd9ecb1a2
commit
4a22f22189
|
@ -19,7 +19,7 @@ Filesystem:
|
||||||
action: PARTITION
|
action: PARTITION
|
||||||
data:
|
data:
|
||||||
size: 1G
|
size: 1G
|
||||||
mount: null
|
fstype: null
|
||||||
- *newpart
|
- *newpart
|
||||||
- *newpart
|
- *newpart
|
||||||
- *newpart
|
- *newpart
|
||||||
|
|
|
@ -19,7 +19,7 @@ Filesystem:
|
||||||
action: PARTITION
|
action: PARTITION
|
||||||
data:
|
data:
|
||||||
size: 1G
|
size: 1G
|
||||||
mount: null
|
fstype: null
|
||||||
- *newpart
|
- *newpart
|
||||||
- *newpart
|
- *newpart
|
||||||
- *newpart
|
- *newpart
|
||||||
|
|
|
@ -163,13 +163,19 @@ class FilesystemController(BaseController):
|
||||||
raise Exception("could not resolve {}".format(id))
|
raise Exception("could not resolve {}".format(id))
|
||||||
|
|
||||||
def _action_clean_devices_raid(self, devices):
|
def _action_clean_devices_raid(self, devices):
|
||||||
return {
|
r = {
|
||||||
self._action_get(d): v
|
self._action_get(d): v
|
||||||
for d, v in zip(devices[::2], devices[1::2])
|
for d, v in zip(devices[::2], devices[1::2])
|
||||||
}
|
}
|
||||||
|
for d in r:
|
||||||
|
assert d.ok_for_raid
|
||||||
|
return r
|
||||||
|
|
||||||
def _action_clean_devices_vg(self, devices):
|
def _action_clean_devices_vg(self, devices):
|
||||||
return {self._action_get(d): 'active' for d in devices}
|
r = {self._action_get(d): 'active' for d in devices}
|
||||||
|
for d in r:
|
||||||
|
assert d.ok_for_lvm_vg
|
||||||
|
return r
|
||||||
|
|
||||||
def _action_clean_level(self, level):
|
def _action_clean_level(self, level):
|
||||||
return raidlevels_by_value[level]
|
return raidlevels_by_value[level]
|
||||||
|
|
Loading…
Reference in New Issue