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

development: Fix error with COMPATIBLE_SYS_DS not being properly honored.

Browse Source
This commit is contained in:
Christian González 2019-02-12 10:11:53 +01:00 committed by Ruben S. Montero
parent 58cd92910a
commit f7940ff71c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/vm/VirtualMachine.cc
View File

@ -1532,7 +1532,7 @@ static int get_datastore_requirements(Template *tmpl, set<int>& ds_ids,
int rc = check_and_set_datastores_id(csystem_ds, ds_ids);
if ( rc != 0 )
if ( rc == -1 )
{
incomp_id = i;
goto error_disk;
@ -1576,6 +1576,11 @@ int VirtualMachine::automatic_requirements(set<int>& cluster_ids,
rc = get_datastore_requirements(obj_template, datastore_ids, error_str);
if (rc == -1)
{
return -1;
}
if ( !cluster_ids.empty() )
{
set<int>::iterator i = cluster_ids.begin();