openstack/devstack
Code Issues Proposed changes

Merge "add the kernel/ramdisk id to driver_info"

Browse Source
This commit is contained in:
Jenkins 2014-12-11 16:16:21 +00:00 committed by Gerrit Code Review
commit 1fc6e18c4a
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ironic
View File

@ -566,10 +566,8 @@ function enroll_nodes {
# we create the bare metal flavor with minimum value # we create the bare metal flavor with minimum value
local node_options="-i ipmi_address=$ipmi_address -i ipmi_password=$ironic_ipmi_passwd\ local node_options="-i ipmi_address=$ipmi_address -i ipmi_password=$ironic_ipmi_passwd\
-i ipmi_username=$ironic_ipmi_username" -i ipmi_username=$ironic_ipmi_username"
if is_deployed_by_agent; then node_options+=" -i $_IRONIC_DEPLOY_KERNEL_KEY=$IRONIC_DEPLOY_KERNEL_ID"
node_options+=" -i $_IRONIC_DEPLOY_KERNEL_KEY=$IRONIC_DEPLOY_KERNEL_ID" node_options+=" -i $_IRONIC_DEPLOY_RAMDISK_KEY=$IRONIC_DEPLOY_RAMDISK_ID"
node_options+=" -i $_IRONIC_DEPLOY_RAMDISK_KEY=$IRONIC_DEPLOY_RAMDISK_ID"
fi
fi fi
local node_id=$(ironic node-create --chassis_uuid $chassis_id \ local node_id=$(ironic node-create --chassis_uuid $chassis_id \
@ -593,11 +591,7 @@ function enroll_nodes {
local adjusted_disk=$(($ironic_node_disk - $ironic_ephemeral_disk)) local adjusted_disk=$(($ironic_node_disk - $ironic_ephemeral_disk))
nova flavor-create --ephemeral $ironic_ephemeral_disk baremetal 551 $ironic_node_ram $adjusted_disk $ironic_node_cpu nova flavor-create --ephemeral $ironic_ephemeral_disk baremetal 551 $ironic_node_ram $adjusted_disk $ironic_node_cpu
# TODO(lucasagomes): Remove the 'baremetal:deploy_kernel_id' nova flavor-key baremetal set "cpu_arch"="x86_64"
# and 'baremetal:deploy_ramdisk_id' parameters
# from the flavor after the completion of
# https://blueprints.launchpad.net/ironic/+spec/add-node-instance-info
nova flavor-key baremetal set "cpu_arch"="x86_64" "baremetal:deploy_kernel_id"="$IRONIC_DEPLOY_KERNEL_ID" "baremetal:deploy_ramdisk_id"="$IRONIC_DEPLOY_RAMDISK_ID"
if [ "$VIRT_DRIVER" == "ironic" ]; then if [ "$VIRT_DRIVER" == "ironic" ]; then
wait_for_nova_resources $total_nodes wait_for_nova_resources $total_nodes