shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-09 09:57:23 +03:00
Code Releases Wiki Activity

Feature #3987: Handle volatile disk names for ceph

Browse Source
This commit is contained in:
Jaime Melis 2015-10-29 17:51:55 +01:00
parent b15594e759
commit 5711e3a1d7
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/vmm/LibVirtDriverKVM.cc
View File

@ -126,6 +126,7 @@ int LibVirtDriver::deployment_description_kvm(
string ceph_host = "";
string ceph_secret = "";
string ceph_user = "";
string pool_name = "";
string sheepdog_host = "";
string gluster_host = "";
string gluster_volume = "";
@ -452,6 +453,7 @@ int LibVirtDriver::deployment_description_kvm(
ceph_host = disk->vector_value("CEPH_HOST");
ceph_secret = disk->vector_value("CEPH_SECRET");
ceph_user = disk->vector_value("CEPH_USER");
pool_name = disk->vector_value("POOL_NAME");
gluster_host = disk->vector_value("GLUSTER_HOST");
gluster_volume = disk->vector_value("GLUSTER_VOLUME");
@ -532,9 +534,27 @@ int LibVirtDriver::deployment_description_kvm(
file << "\t\t<disk type='network' device='cdrom'>" << endl;
}
file << "\t\t\t<source protocol='rbd' name='" << source;
file << "\t\t\t<source protocol='rbd' name='";
if ( clone == "YES" )
if ( !source.empty() )
{
file << source;
}
else
{
if ( !pool_name.empty() )
{
file << pool_name;
}
else
{
file << "one";
}
file << "/one-sys";
}
if ( clone == "YES" || source.empty() )
{
file << "-" << vm->get_oid() << "-" << disk_id;
}