|
|
d67cb5 |
commit 110274aa54e8673a47653da7c9fecb2bd95bd517
|
|
|
d67cb5 |
Author: Marek 'marx' Grac <mgrac@redhat.com>
|
|
|
d67cb5 |
Date: Mon Oct 21 12:45:35 2013 +0200
|
|
|
d67cb5 |
|
|
|
d67cb5 |
fence_vmware: Option --vmware_type is not used correctly
|
|
|
d67cb5 |
|
|
|
d67cb5 |
--vmware_type is defined but --vmware-type was used in source code.
|
|
|
d67cb5 |
|
|
|
d67cb5 |
diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py
|
|
|
d67cb5 |
index 87d0958..dc4ef0f 100644
|
|
|
d67cb5 |
--- a/fence/agents/vmware/fence_vmware.py
|
|
|
d67cb5 |
+++ b/fence/agents/vmware/fence_vmware.py
|
|
|
d67cb5 |
@@ -261,17 +261,17 @@ def vmware_is_supported_vmrun_version(options):
|
|
|
d67cb5 |
def vmware_check_vmware_type(options):
|
|
|
d67cb5 |
global vmware_internal_type
|
|
|
d67cb5 |
|
|
|
d67cb5 |
- options["--vmware-type"] = options["--vmware-type"].lower()
|
|
|
d67cb5 |
+ options["--vmware_type"] = options["--vmware_type"].lower()
|
|
|
d67cb5 |
|
|
|
d67cb5 |
- if (options["--vmware-type"]=="esx"):
|
|
|
d67cb5 |
+ if (options["--vmware_type"]=="esx"):
|
|
|
d67cb5 |
vmware_internal_type = VMWARE_TYPE_ESX
|
|
|
d67cb5 |
if (not options.has_key("--exec")):
|
|
|
d67cb5 |
options["--exec"] = VMHELPER_COMMAND
|
|
|
d67cb5 |
- elif (options["--vmware-type"]=="server2"):
|
|
|
d67cb5 |
+ elif (options["--vmware_type"]=="server2"):
|
|
|
d67cb5 |
vmware_internal_type = VMWARE_TYPE_SERVER2
|
|
|
d67cb5 |
if (not options.has_key("--exec")):
|
|
|
d67cb5 |
options["--exec"] = VMRUN_COMMAND
|
|
|
d67cb5 |
- elif (options["--vmware-type"]=="server1"):
|
|
|
d67cb5 |
+ elif (options["--vmware_type"]=="server1"):
|
|
|
d67cb5 |
vmware_internal_type = VMWARE_TYPE_SERVER1
|
|
|
d67cb5 |
if (not options.has_key("--exec")):
|
|
|
d67cb5 |
options["--exec"] = VMRUN_COMMAND
|