From cf12ad9b409bbab440582fd20df64805bd541f85 Mon Sep 17 00:00:00 2001 From: vsaienko Date: Fri, 4 Mar 2016 14:51:08 +0200 Subject: [PATCH] Remove code duplication. deploy_kernel and deploy_ramdisk are common for cases when deploy driver is *_ipmitool and not *_ipmitool. Change-Id: I2cf7071b714399947b2de20e938864e0624c4f11 --- devstack/lib/ironic | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 379072dc08..c297e71a82 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -660,21 +660,21 @@ function enroll_nodes { if is_deployed_by_ipmitool; then local node_options="\ - -i deploy_kernel=$IRONIC_DEPLOY_KERNEL_ID \ - -i deploy_ramdisk=$IRONIC_DEPLOY_RAMDISK_ID \ -i ipmi_address=127.0.0.1 \ -i ipmi_username=admin \ -i ipmi_password=password" else local node_options="\ - -i deploy_kernel=$IRONIC_DEPLOY_KERNEL_ID \ - -i deploy_ramdisk=$IRONIC_DEPLOY_RAMDISK_ID \ -i ssh_virt_type=$IRONIC_SSH_VIRT_TYPE \ -i ssh_address=$IRONIC_VM_SSH_ADDRESS \ -i ssh_port=$IRONIC_VM_SSH_PORT \ -i ssh_username=$IRONIC_SSH_USERNAME \ -i ssh_key_filename=$IRONIC_KEY_FILE" fi + node_options="\ + $node_options \ + -i deploy_kernel=$IRONIC_DEPLOY_KERNEL_ID \ + -i deploy_ramdisk=$IRONIC_DEPLOY_RAMDISK_ID" else local ironic_node_cpu=$IRONIC_HW_NODE_CPU