openstack
/
ironic
Code Issues Proposed changes

Merge "Fix multiple assignment of redfish_system_id during node creation"

This commit is contained in:
Zuul 2024-03-08 01:00:03 +00:00 committed by Gerrit Code Review
parent aa8d9eeb80 abe8843ddc
commit 4a147edd4d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/lib/ironic
View File

@ -2462,19 +2462,19 @@ function enroll_nodes {
local ironic_hwinfo_file=$IRONIC_VM_MACS_CSV_FILE
if is_deployed_by_ipmi; then
local node_options="\
local deploy_options="\
--driver-info ipmi_address=${HOST_IP} \
--driver-info ipmi_username=admin \
--driver-info ipmi_password=password"
elif is_deployed_by_snmp; then
local node_options="\
local deploy_options="\
--driver-info snmp_driver=${IRONIC_VPDU_SNMPDRIVER} \
--driver-info snmp_address=${HOST_IP} \
--driver-info snmp_port=${IRONIC_VPDU_LISTEN_PORT} \
--driver-info snmp_protocol=2c \
--driver-info snmp_community=${IRONIC_VPDU_COMMUNITY}"
elif is_deployed_by_redfish; then
local node_options="\
local deploy_options="\
--driver-info redfish_address=http://${HOST_IP}:${IRONIC_REDFISH_EMULATOR_PORT} \
--driver-info redfish_username=admin \
--driver-info redfish_password=password"
@ -2498,6 +2498,8 @@ function enroll_nodes {
local node_name
node_name=$node_prefix-$total_nodes
local node_options="$deploy_options"
local node_capabilities=""
if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then
node_capabilities+=" --property capabilities=boot_mode:uefi"