shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Revert "Development: Fix Ceph CDROM"

Browse Source 
This reverts commit 0b2e644a1818ddcfd629ab7ea42990a5cd840dca.
This commit is contained in:
Ruben S. Montero 2016-06-10 14:57:47 +02:00
parent d9190f8949
commit 19a3efe79d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/datastore/Datastore.cc
View File

@ -149,7 +149,6 @@ void Datastore::disk_attribute(
if (VirtualMachine::is_volatile(disk))
{
disk->replace("DISK_TYPE", Image::disk_type_to_str(get_disk_type()));
disk->replace("TYPE", Image::disk_type_to_str(get_disk_type()));
}
}

4
src/vmm/LibVirtDriverKVM.cc
View File

@ -530,9 +530,9 @@ int LibVirtDriver::deployment_description_kvm(
<< "\t\t\t</auth>\n";
}
}
else if ( type == "RBD" || type == "RBD_CDROM" )
else if ( type == "RBD" || type == "RBD_CDROM" || disk_type == "RBD" )
{
if ( type == "RBD" )
if (type == "RBD" || disk_type == "RBD")
{
file << "\t\t<disk type='network' device='disk'>" << endl;
}