Browse Source

Merge "Ensure lanplus is unset when using redfish" into stable/train

changes/83/739283/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
4460e68e7d
2 changed files with 2 additions and 4 deletions
  1. +2
    -3
      tripleo_common/actions/parameters.py
  2. +0
    -1
      tripleo_common/tests/actions/test_parameters.py

+ 2
- 3
tripleo_common/actions/parameters.py View File

@@ -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:


+ 0
- 1
tripleo_common/tests/actions/test_parameters.py View File

@@ -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",


Loading…
Cancel
Save