Skip to content

Commit fd54c68

Browse files
authored
Merge pull request retspen#664 from fangebee/master
Some fixes regarding Ceph/RBD volumes handling
2 parents fb108f9 + f26fa3d commit fd54c68

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

vrtManager/instance.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ def get_bootorder(self):
631631
dev_type = dev.get("type")
632632
dev_device = dev.get("device")
633633

634-
if dev_type == "file":
634+
if dev_type == "file" or (dev_device == "disk" and dev_type == "network"):
635635
dev_target = dev.find("target").get("dev")
636636

637637
elif dev_type == "network":

vrtManager/storage.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ def get_pool_by_target(self, target):
3434
stg = wvmStorage(self.host, self.login, self.passwd, self.conn, pool_name)
3535
if stg.get_target_path() == target:
3636
return self.get_storage(pool_name)
37+
if stg.get_type() == "rbd" and stg.get_source_name() == target:
38+
return self.get_storage(pool_name)
3739
return None
3840

3941
def create_storage(self, stg_type, name, source, target):

0 commit comments

Comments
 (0)