From 59d5110b8fb9c482d469f1bebf19c313aca37ee6 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 20 Aug 2019 09:29:25 -0400 Subject: [PATCH] Also enable ipmi if user sets in console.method --- confluent_server/confluent/discovery/handlers/xcc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/confluent_server/confluent/discovery/handlers/xcc.py b/confluent_server/confluent/discovery/handlers/xcc.py index f7f17b67..1ae0b160 100644 --- a/confluent_server/confluent/discovery/handlers/xcc.py +++ b/confluent_server/confluent/discovery/handlers/xcc.py @@ -361,11 +361,11 @@ class NodeHandler(immhandler.NodeHandler): cd = self.configmanager.get_node_attributes( nodename, ['secret.hardwaremanagementuser', 'secret.hardwaremanagementpassword', - 'hardwaremanagement.manager', 'hardwaremanagement.method'], + 'hardwaremanagement.manager', 'hardwaremanagement.method', 'console.method'], True) cd = cd.get(nodename, {}) - - if cd.get('hardwaremanagement.method', {}).get('value', 'ipmi') != 'redfish': + if (cd.get('hardwaremanagement.method', {}).get('value', 'ipmi') != 'redfish' + or cd.get('console.method', {}).get('value', None) == 'ipmi'): nwc = wc.dupe() nwc.set_basic_credentials(self._currcreds[0], self._currcreds[1]) rsp = nwc.grab_json_response('/redfish/v1/Managers/1/NetworkProtocol')