From b7d5bf6e9d2140e932419fd0cce11afe161dc73e Mon Sep 17 00:00:00 2001 From: Yuiko Takada Date: Thu, 20 Nov 2014 18:23:06 +0900 Subject: [PATCH] add the kernel/ramdisk id to driver_info Because bp https://blueprints.launchpad.net/ironic/+spec/add-node-instance-info has been completed, add the deploy_kernel_id and deploy_ramdisk_id to ironic node's driver_info in stead of to flavor. Change-Id: I90ffae49212e68749b8331edc278228419317453 --- lib/ironic | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/ironic b/lib/ironic index 28f8fe87e5..b329438cad 100644 --- a/lib/ironic +++ b/lib/ironic @@ -564,10 +564,8 @@ function enroll_nodes { # we create the bare metal flavor with minimum value local node_options="-i ipmi_address=$ipmi_address -i ipmi_password=$ironic_ipmi_passwd\ -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_RAMDISK_KEY=$IRONIC_DEPLOY_RAMDISK_ID" - fi + node_options+=" -i $_IRONIC_DEPLOY_KERNEL_KEY=$IRONIC_DEPLOY_KERNEL_ID" + node_options+=" -i $_IRONIC_DEPLOY_RAMDISK_KEY=$IRONIC_DEPLOY_RAMDISK_ID" fi local node_id=$(ironic node-create --chassis_uuid $chassis_id \ @@ -591,11 +589,7 @@ function enroll_nodes { 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 - # TODO(lucasagomes): Remove the 'baremetal:deploy_kernel_id' - # 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" + nova flavor-key baremetal set "cpu_arch"="x86_64" if [ "$VIRT_DRIVER" == "ironic" ]; then wait_for_nova_resources $total_nodes