M #-: Do not add TM_MAD requirements for networks

This commit is contained in:
Ruben S. Montero committed 2019-09-11 13:14:14 +02:00
1 parent 5b0a9f5f4b
commit b69e558808
2 files changed
+7 -5

No files matched your search

+6 -5
View File
@@ -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());
+1
View File
@@ -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);