mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 03:42:52 +09:00
Changes required to use addon-sheepdog
Just .h and .cc files to avoid users being forced to compile opennebula. (cherry picked from commit72faa33d2d) (cherry picked from commit02e34cce7b)
This commit is contained in:
1 parent
c1afb55b6a
commit
7204dba0b0
4 files changed
+33
No files matched your search
@@ -335,6 +335,7 @@ int Datastore::insert(SqlDB *db, string& error_str)
|
||||
goto error_disk_type;
|
||||
break;
|
||||
case Image::RBD_CDROM:
|
||||
case Image::SHEEPDOG_CDROM:
|
||||
case Image::GLUSTER_CDROM:
|
||||
goto error_invalid_disk_type;
|
||||
break;
|
||||
|
||||
@@ -610,6 +610,10 @@ int Image::disk_attribute( VectorAttribute * disk,
|
||||
new_disk_type = RBD_CDROM;
|
||||
break;
|
||||
|
||||
case SHEEPDOG:
|
||||
new_disk_type = SHEEPDOG_CDROM;
|
||||
break;
|
||||
|
||||
case GLUSTER:
|
||||
new_disk_type = GLUSTER_CDROM;
|
||||
break;
|
||||
@@ -784,6 +788,10 @@ Image::DiskType Image::str_to_disk_type(string& s_disk_type)
|
||||
{
|
||||
type = Image::RBD;
|
||||
}
|
||||
else if (s_disk_type == "SHEEPDOG")
|
||||
{
|
||||
type = Image::SHEEPDOG;
|
||||
}
|
||||
else if (s_disk_type == "GLUSTER")
|
||||
{
|
||||
type = Image::GLUSTER;
|
||||
|
||||
@@ -537,6 +537,26 @@ int LibVirtDriver::deployment_description_kvm(
|
||||
<< "\t\t\t</auth>" << endl;
|
||||
}
|
||||
}
|
||||
else if ( type == "SHEEPDOG" || type == "SHEEPDOG_CDROM" )
|
||||
{
|
||||
if (type == "SHEEPDOG")
|
||||
{
|
||||
file << "\t\t<disk type='network' device='disk'>" << endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
file << "\t\t<disk type='network' device='cdrom'>" << endl;
|
||||
}
|
||||
|
||||
file << "\t\t\t<source protocol='sheepdog' name='" << source;
|
||||
|
||||
if ( clone == "YES" )
|
||||
{
|
||||
file << "-" << vm->get_oid() << "-" << disk_id;
|
||||
}
|
||||
|
||||
file << "'/>" << endl;
|
||||
}
|
||||
else if ( type == "GLUSTER" || type == "GLUSTER_CDROM" )
|
||||
{
|
||||
if ( type == "GLUSTER" )
|
||||
|
||||
Reference in new issue
Block a user