openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Make fencing action parameter optional."

This commit is contained in:
Jenkins 2017-03-15 19:05:13 +00:00 committed by Gerrit Code Review
parent ca955a0f97 747f73b8a6
commit e37fa90d90
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleo_common/actions/parameters.py
View File

@ -264,7 +264,8 @@ class GenerateFencingParametersAction(base.TripleOAction):
if node["pm_type"] == "pxe_ssh":
# Ironic fencing driver
node_data["agent"] = "fence_ironic"
params["action"] = self.fence_action
if self.fence_action:
params["action"] = self.fence_action
params["auth_url"] = self.os_auth["auth_url"]
params["login"] = self.os_auth["login"]
params["passwd"] = self.os_auth["passwd"]
@ -277,7 +278,8 @@ class GenerateFencingParametersAction(base.TripleOAction):
elif node["pm_type"].split('_')[1] in ("ipmitool", "ilo", "drac"):
# IPMI fencing driver
node_data["agent"] = "fence_ipmilan"
params["action"] = self.fence_action
if self.fence_action:
params["action"] = self.fence_action
params["ipaddr"] = node["pm_addr"]
params["passwd"] = node["pm_password"]
params["login"] = node["pm_user"]