openstack
/
tripleo-common
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2020-06-25 14:14:26 +00:00 committed by Gerrit Code Review
parent 5aba85f4b8 10bcbc4195
commit 759d2774a5
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tripleo_common/tests/utils/test_stack_parameters.py
View File

@ -598,7 +598,6 @@ class StackParametersTest(base.TestCase):
"delay": 28, "delay": 28,
"ipaddr": "172.16.0.1:8000", "ipaddr": "172.16.0.1:8000",
"ipport": "8000", "ipport": "8000",
"lanplus": True,
"privlvl": 5, "privlvl": 5,
"login": "root", "login": "root",
"passwd": "calvin", "passwd": "calvin",

5
tripleo_common/utils/stack_parameters.py
View File

@ -170,12 +170,13 @@ def generate_fencing_parameters(ironic, compute, nodes_json, delay,
if driver_proto in {'ipmi', 'ipmitool', 'drac', 'idrac', 'ilo', if driver_proto in {'ipmi', 'ipmitool', 'drac', 'idrac', 'ilo',
'redfish'}: 'redfish'}:
# IPMI fencing driver
if driver_proto == "redfish": if driver_proto == "redfish":
node_data["agent"] = "fence_redfish" node_data["agent"] = "fence_redfish"
params["systems_uri"] = node["pm_system_id"] params["systems_uri"] = node["pm_system_id"]
else: else:
node_data["agent"] = "fence_ipmilan" node_data["agent"] = "fence_ipmilan"
if ipmi_lanplus:
params["lanplus"] = ipmi_lanplus
params["ipaddr"] = node["pm_addr"] params["ipaddr"] = node["pm_addr"]
params["passwd"] = node["pm_password"] params["passwd"] = node["pm_password"]
params["login"] = node["pm_user"] params["login"] = node["pm_user"]
@ -189,8 +190,6 @@ def generate_fencing_parameters(ironic, compute, nodes_json, delay,
params["ssl_insecure"] = "true" params["ssl_insecure"] = "true"
else: else:
params["ssl_insecure"] = "false" params["ssl_insecure"] = "false"
if ipmi_lanplus:
params["lanplus"] = ipmi_lanplus
if delay: if delay:
params["delay"] = delay params["delay"] = delay
if ipmi_cipher: if ipmi_cipher: