openstack/ironic
Code Issues Proposed changes

Merge "Follow-up patch for rescue mode devstack change"

Browse Source
This commit is contained in:
Zuul 2018-03-22 04:38:56 +00:00 committed by Gerrit Code Review
commit 4361e2f97f
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
devstack/lib/ironic
View File

@ -1775,6 +1775,12 @@ function enroll_nodes {
local interface_info
common_node_options="\
--driver-info deploy_kernel=$IRONIC_DEPLOY_KERNEL_ID \
--driver-info deploy_ramdisk=$IRONIC_DEPLOY_RAMDISK_ID \
--driver-info rescue_kernel=$IRONIC_DEPLOY_KERNEL_ID \
--driver-info rescue_ramdisk=$IRONIC_DEPLOY_RAMDISK_ID"
if [[ "$IRONIC_IS_HARDWARE" == "False" ]]; then
local ironic_node_cpu=$IRONIC_VM_SPECS_CPU
local ironic_node_ram=$IRONIC_VM_SPECS_RAM
@ -1801,12 +1807,7 @@ function enroll_nodes {
--driver-info redfish_username=admin \
--driver-info redfish_password=password"
fi
node_options="\
$node_options \
--driver-info deploy_kernel=$IRONIC_DEPLOY_KERNEL_ID \
--driver-info deploy_ramdisk=$IRONIC_DEPLOY_RAMDISK_ID \
--driver-info rescue_kernel=$IRONIC_DEPLOY_KERNEL_ID \
--driver-info rescue_ramdisk=$IRONIC_DEPLOY_RAMDISK_ID"
node_options+=" $common_node_options"
else
local ironic_node_cpu=$IRONIC_HW_NODE_CPU
@ -1880,10 +1881,7 @@ function enroll_nodes {
bmc_username=$(echo $hardware_info |awk '{print $3}')
local bmc_passwd
bmc_passwd=$(echo $hardware_info |awk '{print $4}')
local node_options="--driver-info deploy_kernel=$IRONIC_DEPLOY_KERNEL_ID"
node_options+=" --driver-info deploy_ramdisk=$IRONIC_DEPLOY_RAMDISK_ID"
node_options+=" --driver-info rescue_kernel=$IRONIC_DEPLOY_KERNEL_ID"
node_options+=" --driver-info rescue_ramdisk=$IRONIC_DEPLOY_RAMDISK_ID"
local node_options="$common_node_options"
if is_deployed_by_ipmitool; then
node_options+=" --driver-info ipmi_address=$bmc_address \