From b69e5588086810bcf390621be0378716dcf29bf4 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Wed, 11 Sep 2019 13:13:43 +0200 Subject: [PATCH] M #-: Do not add TM_MAD requirements for networks --- src/vm/VirtualMachine.cc | 11 ++++++----- src/vm/VirtualMachineDisk.cc | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc index aa711603f8..156e443907 100644 --- a/src/vm/VirtualMachine.cc +++ b/src/vm/VirtualMachine.cc @@ -1616,11 +1616,6 @@ int VirtualMachine::automatic_requirements(set& 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& 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()); diff --git a/src/vm/VirtualMachineDisk.cc b/src/vm/VirtualMachineDisk.cc index 30b230d5a6..bd2aca4043 100644 --- a/src/vm/VirtualMachineDisk.cc +++ b/src/vm/VirtualMachineDisk.cc @@ -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);