Merge pull request #664 from fangebee/master

Some fixes regarding Ceph/RBD volumes handling

Author: catborise

vrtManager/instance.py

@@ -631,7 +631,7 @@ def get_bootorder(self):
                 dev_type = dev.get("type")
                 dev_device = dev.get("device")
 
-                if dev_type == "file":
+                if dev_type == "file" or (dev_device == "disk" and dev_type == "network"):
                     dev_target = dev.find("target").get("dev")
 
                 elif dev_type == "network":

vrtManager/storage.py

@@ -34,6 +34,8 @@ def get_pool_by_target(self, target):
             stg = wvmStorage(self.host, self.login, self.passwd, self.conn, pool_name)
             if stg.get_target_path() == target:
                 return self.get_storage(pool_name)
+            if stg.get_type() == "rbd" and stg.get_source_name() == target:
+                return self.get_storage(pool_name)
         return None
 
     def create_storage(self, stg_type, name, source, target):