From 34283f29c197764935e5797b63c2875fadfe8d1e Mon Sep 17 00:00:00 2001 From: Luca Miccini Date: Tue, 23 Jun 2020 13:55:16 +0200 Subject: [PATCH] Ensure lanplus is unset when using redfish This avoids the additional burden of having to explicitly add '--ipmi-no-lanplus' to the generate fencing command. Change-Id: I1eab370213ce8d1f71f70016b481128254cec046 (manually cherry picked from commit b440733f434a92d746aba29e777dcc592c52edac) --- tripleo_common/actions/parameters.py | 5 ++--- tripleo_common/tests/actions/test_parameters.py | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tripleo_common/actions/parameters.py b/tripleo_common/actions/parameters.py index 820084fd5..d07647465 100644 --- a/tripleo_common/actions/parameters.py +++ b/tripleo_common/actions/parameters.py @@ -445,12 +445,13 @@ class GenerateFencingParametersAction(base.TripleOAction): if driver_proto in {'ipmi', 'ipmitool', 'drac', 'idrac', 'ilo', 'redfish'}: - # IPMI fencing driver if driver_proto == "redfish": node_data["agent"] = "fence_redfish" params["systems_uri"] = node["pm_system_id"] else: node_data["agent"] = "fence_ipmilan" + if self.ipmi_lanplus: + params["lanplus"] = self.ipmi_lanplus params["ipaddr"] = node["pm_addr"] params["passwd"] = node["pm_password"] params["login"] = node["pm_user"] @@ -464,8 +465,6 @@ class GenerateFencingParametersAction(base.TripleOAction): params["ssl_insecure"] = "true" else: params["ssl_insecure"] = "false" - if self.ipmi_lanplus: - params["lanplus"] = self.ipmi_lanplus if self.delay: params["delay"] = self.delay if self.ipmi_cipher: diff --git a/tripleo_common/tests/actions/test_parameters.py b/tripleo_common/tests/actions/test_parameters.py index 582ca1bc1..148c8af03 100644 --- a/tripleo_common/tests/actions/test_parameters.py +++ b/tripleo_common/tests/actions/test_parameters.py @@ -1252,7 +1252,6 @@ class GenerateFencingParametersActionTestCase(base.TestCase): "delay": 28, "ipaddr": "172.16.0.1:8000", "ipport": "8000", - "lanplus": True, "privlvl": 5, "login": "root", "passwd": "calvin",