From 2545a7b744c152939a7186aa8effa5782f0d45b2 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 28 Nov 2023 16:09:01 -0500 Subject: [PATCH] Allow similar for IPMI hostnames --- node-daemon/pvcnoded/util/config.py | 4 +--- pvc.sample.conf | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/node-daemon/pvcnoded/util/config.py b/node-daemon/pvcnoded/util/config.py index 497424ac..cc98e81e 100644 --- a/node-daemon/pvcnoded/util/config.py +++ b/node-daemon/pvcnoded/util/config.py @@ -311,9 +311,7 @@ def get_configuration_current(config_file): "suicide_intervals": int(o_fencing["intervals"].get("suicide_interval", 0)), "successful_fence": o_fencing["actions"].get("successful_fence", None), "failed_fence": o_fencing["actions"].get("failed_fence", None), - "ipmi_hostname": o_fencing["ipmi"]["hostname_format"].format( - node_id=node_id - ), + "ipmi_hostname": o_fencing["ipmi"]["hostname"].format(node_id=node_id), "ipmi_username": o_fencing["ipmi"]["username"], "ipmi_password": o_fencing["ipmi"]["password"], } diff --git a/pvc.sample.conf b/pvc.sample.conf index d0c74714..29a4c5d7 100644 --- a/pvc.sample.conf +++ b/pvc.sample.conf @@ -247,8 +247,8 @@ fencing: # IPMI details ipmi: - # Hostname format, using a "{node_id}" entry - hostname_format: "pvchv{node_id}-lom.mydomain.tld" + # Hostname format; use a "{node_id}" entry for a template, or a literal hostname + hostname: "pvchv{node_id}-lom.mydomain.tld" # IPMI username username: admin