mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-22 20:54:49 +09:00
M #-: Do not add TM_MAD requirements for networks
This commit is contained in:
2 files changed
+7
-5
No files matched your search
@@ -1616,11 +1616,6 @@ int VirtualMachine::automatic_requirements(set<int>& cluster_ids,
|
||||
|
||||
oss.str("");
|
||||
|
||||
if ( obj_template->get("TM_MAD_SYSTEM", tm_mad_system) )
|
||||
{
|
||||
oss << "(TM_MAD = \"" << one_util::trim(tm_mad_system) << "\") & ";
|
||||
}
|
||||
|
||||
// Set automatic System DS requirements
|
||||
|
||||
if ( !cluster_ids.empty() || !datastore_ids.empty() )
|
||||
@@ -1658,6 +1653,12 @@ int VirtualMachine::automatic_requirements(set<int>& cluster_ids,
|
||||
}
|
||||
|
||||
oss << ")";
|
||||
|
||||
}
|
||||
|
||||
if ( obj_template->get("TM_MAD_SYSTEM", tm_mad_system) )
|
||||
{
|
||||
oss << " & (TM_MAD = \"" << one_util::trim(tm_mad_system) << "\")";
|
||||
}
|
||||
|
||||
obj_template->add("AUTOMATIC_DS_REQUIREMENTS", oss.str());
|
||||
|
||||
@@ -1174,6 +1174,7 @@ VirtualMachineDisk * VirtualMachineDisks::set_up_attach(int vmid, int uid,
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
disk->set_attach();
|
||||
|
||||
if ( !tsys.empty() )
|
||||
{
|
||||
disk->replace("TM_MAD_SYSTEM", tsys);
|
||||
|
||||
Reference in new issue
Block a user