From af99c0742be6119d100080a3e78250c114f37f59 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 25 Aug 2010 17:49:54 +0000 Subject: [PATCH] -For lsvm and revacuate and rmhypervisor, accept nodetype.os as a sufficient hint as how to proceed git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7237 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/esx.pm | 4 ++-- xCAT-server/lib/xcat/plugins/kvm.pm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm index a0a1ebfbb..90361fc34 100644 --- a/xCAT-server/lib/xcat/plugins/esx.pm +++ b/xCAT-server/lib/xcat/plugins/esx.pm @@ -75,8 +75,8 @@ sub handled_commands{ rmvm => 'nodehm:mgt', rinv => 'nodehm:mgt', chvm => 'nodehm:mgt', - lsvm => 'hypervisor:type', - rmhypervisor => 'hypervisor:type', + lsvm => ['hypervisor:type','nodetype:os=(esx.*)'], + rmhypervisor => ['hypervisor:type','nodetype:os=(esx.*)'], #lsvm => 'nodehm:mgt', not really supported yet }; } diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm index 5d6af13f6..b9cb875f3 100644 --- a/xCAT-server/lib/xcat/plugins/kvm.pm +++ b/xCAT-server/lib/xcat/plugins/kvm.pm @@ -70,10 +70,10 @@ sub handled_commands { #rvitals => 'nodehm:mgt', #rinv => 'nodehm:mgt', getrvidparms => 'nodehm:mgt', - lsvm => 'hypervisor:type', + lsvm => ['hypervisor:type','nodetype.os=(rhel.*)'], rbeacon => 'nodehm:mgt', - revacuate => 'hypervisor:type', - vmstatenotify => 'hypervisor:type', + revacuate => ['hypervisor:type','nodetype.os=(rhel.*)|(sles11.*)|(centos.*)|(fedora.*)'], + vmstatenotify => ['hypervisor:type','nodetype.os=(rhel.*)|(sles11.*)|(centos.*)|(fedora.*)'], #rspreset => 'nodehm:mgt', #rspconfig => 'nodehm:mgt', #rbootseq => 'nodehm:mgt',