|
 |
e4ffb1 |
From 05a6bf8619560b559bfb0ea3688635935a96ca94 Mon Sep 17 00:00:00 2001
|
|
|
e4ffb1 |
From: Marek 'marx' Grac <mgrac@redhat.com>
|
|
|
e4ffb1 |
Date: Thu, 19 Mar 2015 21:28:22 +0100
|
|
|
e4ffb1 |
Subject: [PATCH 5/5] fence_ipmilan: Un-set default cipher
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
Previously, the default cipher was left to ipmitool, in one of latest releases we have changed it
|
|
|
e4ffb1 |
to cipher=0. This commit removes this default and uses --cipher for ipmitool only when explicitly
|
|
|
e4ffb1 |
set by user.
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
Resolves: rhbz#1203877
|
|
|
e4ffb1 |
---
|
|
|
e4ffb1 |
fence/agents/ipmilan/fence_ipmilan.py | 4 ++--
|
|
|
e4ffb1 |
tests/data/metadata/fence_idrac.xml | 2 +-
|
|
|
e4ffb1 |
tests/data/metadata/fence_ilo3.xml | 2 +-
|
|
|
e4ffb1 |
tests/data/metadata/fence_ilo4.xml | 2 +-
|
|
|
e4ffb1 |
tests/data/metadata/fence_imm.xml | 2 +-
|
|
|
e4ffb1 |
tests/data/metadata/fence_ipmilan.xml | 2 +-
|
|
|
e4ffb1 |
6 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
diff --git a/fence/agents/ipmilan/fence_ipmilan.py b/fence/agents/ipmilan/fence_ipmilan.py
|
|
|
e4ffb1 |
index eaff7b7..8490837 100644
|
|
|
e4ffb1 |
--- a/fence/agents/ipmilan/fence_ipmilan.py
|
|
|
e4ffb1 |
+++ b/fence/agents/ipmilan/fence_ipmilan.py
|
|
|
e4ffb1 |
@@ -53,7 +53,8 @@ def create_command(options, action):
|
|
|
e4ffb1 |
cmd += " -P ''"
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
# --cipher / -C
|
|
|
e4ffb1 |
- cmd += " -C " + options["--cipher"]
|
|
|
e4ffb1 |
+ if "--cipher" in options:
|
|
|
e4ffb1 |
+ cmd += " -C " + options["--cipher"]
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
# --port / -n
|
|
|
e4ffb1 |
if options.has_key("--ipport"):
|
|
|
e4ffb1 |
@@ -96,7 +97,6 @@ def define_new_opts():
|
|
|
e4ffb1 |
"help" : "-C, --cipher=[cipher] Ciphersuite to use (same as ipmitool -C parameter)",
|
|
|
e4ffb1 |
"required" : "0",
|
|
|
e4ffb1 |
"shortdesc" : "Ciphersuite to use (same as ipmitool -C parameter)",
|
|
|
e4ffb1 |
- "default" : "0",
|
|
|
e4ffb1 |
"order": 1
|
|
|
e4ffb1 |
}
|
|
|
e4ffb1 |
all_opt["privlvl"] = {
|
|
|
e4ffb1 |
diff --git a/tests/data/metadata/fence_idrac.xml b/tests/data/metadata/fence_idrac.xml
|
|
|
e4ffb1 |
index 26a2758..dcb3235 100644
|
|
|
e4ffb1 |
--- a/tests/data/metadata/fence_idrac.xml
|
|
|
e4ffb1 |
+++ b/tests/data/metadata/fence_idrac.xml
|
|
|
e4ffb1 |
@@ -61,7 +61,7 @@
|
|
|
e4ffb1 |
</parameter>
|
|
|
e4ffb1 |
<parameter name="cipher" unique="0" required="0">
|
|
|
e4ffb1 |
<getopt mixed="-C, --cipher=[cipher]" />
|
|
|
e4ffb1 |
- <content type="string" default="0" />
|
|
|
e4ffb1 |
+ <content type="string" />
|
|
|
e4ffb1 |
<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
|
|
|
e4ffb1 |
</parameter>
|
|
|
e4ffb1 |
<parameter name="privlvl" unique="0" required="0">
|
|
|
e4ffb1 |
diff --git a/tests/data/metadata/fence_ilo3.xml b/tests/data/metadata/fence_ilo3.xml
|
|
|
e4ffb1 |
index c1e01ae..e6a48bc 100644
|
|
|
e4ffb1 |
--- a/tests/data/metadata/fence_ilo3.xml
|
|
|
e4ffb1 |
+++ b/tests/data/metadata/fence_ilo3.xml
|
|
|
e4ffb1 |
@@ -61,7 +61,7 @@
|
|
|
e4ffb1 |
</parameter>
|
|
|
e4ffb1 |
<parameter name="cipher" unique="0" required="0">
|
|
|
e4ffb1 |
<getopt mixed="-C, --cipher=[cipher]" />
|
|
|
e4ffb1 |
- <content type="string" default="0" />
|
|
|
e4ffb1 |
+ <content type="string" />
|
|
|
e4ffb1 |
<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
|
|
|
e4ffb1 |
</parameter>
|
|
|
e4ffb1 |
<parameter name="privlvl" unique="0" required="0">
|
|
|
e4ffb1 |
diff --git a/tests/data/metadata/fence_ilo4.xml b/tests/data/metadata/fence_ilo4.xml
|
|
|
e4ffb1 |
index bbba9a0..e7b0d60 100644
|
|
|
e4ffb1 |
--- a/tests/data/metadata/fence_ilo4.xml
|
|
|
e4ffb1 |
+++ b/tests/data/metadata/fence_ilo4.xml
|
|
|
e4ffb1 |
@@ -61,7 +61,7 @@
|
|
|
e4ffb1 |
</parameter>
|
|
|
e4ffb1 |
<parameter name="cipher" unique="0" required="0">
|
|
|
e4ffb1 |
<getopt mixed="-C, --cipher=[cipher]" />
|
|
|
e4ffb1 |
- <content type="string" default="0" />
|
|
|
e4ffb1 |
+ <content type="string" />
|
|
|
e4ffb1 |
<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
|
|
|
e4ffb1 |
</parameter>
|
|
|
e4ffb1 |
<parameter name="privlvl" unique="0" required="0">
|
|
|
e4ffb1 |
diff --git a/tests/data/metadata/fence_imm.xml b/tests/data/metadata/fence_imm.xml
|
|
|
e4ffb1 |
index addfcd4..8fbdddd 100644
|
|
|
e4ffb1 |
--- a/tests/data/metadata/fence_imm.xml
|
|
|
e4ffb1 |
+++ b/tests/data/metadata/fence_imm.xml
|
|
|
e4ffb1 |
@@ -61,7 +61,7 @@
|
|
|
e4ffb1 |
</parameter>
|
|
|
e4ffb1 |
<parameter name="cipher" unique="0" required="0">
|
|
|
e4ffb1 |
<getopt mixed="-C, --cipher=[cipher]" />
|
|
|
e4ffb1 |
- <content type="string" default="0" />
|
|
|
e4ffb1 |
+ <content type="string" />
|
|
|
e4ffb1 |
<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
|
|
|
e4ffb1 |
</parameter>
|
|
|
e4ffb1 |
<parameter name="privlvl" unique="0" required="0">
|
|
|
e4ffb1 |
diff --git a/tests/data/metadata/fence_ipmilan.xml b/tests/data/metadata/fence_ipmilan.xml
|
|
|
e4ffb1 |
index d15e352..199490c 100644
|
|
|
e4ffb1 |
--- a/tests/data/metadata/fence_ipmilan.xml
|
|
|
e4ffb1 |
+++ b/tests/data/metadata/fence_ipmilan.xml
|
|
|
e4ffb1 |
@@ -61,7 +61,7 @@
|
|
|
e4ffb1 |
</parameter>
|
|
|
e4ffb1 |
<parameter name="cipher" unique="0" required="0">
|
|
|
e4ffb1 |
<getopt mixed="-C, --cipher=[cipher]" />
|
|
|
e4ffb1 |
- <content type="string" default="0" />
|
|
|
e4ffb1 |
+ <content type="string" />
|
|
|
e4ffb1 |
<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
|
|
|
e4ffb1 |
</parameter>
|
|
|
e4ffb1 |
<parameter name="privlvl" unique="0" required="0">
|
|
|
e4ffb1 |
--
|
|
|
e4ffb1 |
1.9.3
|
|
|
e4ffb1 |
|