openstack/ironic
Code Issues Proposed changes

Remove code duplication.

Browse Source 
deploy_kernel and deploy_ramdisk are common for cases when
deploy driver is *_ipmitool and not *_ipmitool.

Change-Id: I2cf7071b714399947b2de20e938864e0624c4f11
This commit is contained in:
vsaienko 2016-03-04 14:51:08 +02:00
parent b3a5325d98
commit cf12ad9b40
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/lib/ironic
View File

@ -660,21 +660,21 @@ function enroll_nodes {
if is_deployed_by_ipmitool; then if is_deployed_by_ipmitool; then
local node_options="\ 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_address=127.0.0.1 \
-i ipmi_username=admin \ -i ipmi_username=admin \
-i ipmi_password=password" -i ipmi_password=password"
else else
local node_options="\ 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_virt_type=$IRONIC_SSH_VIRT_TYPE \
-i ssh_address=$IRONIC_VM_SSH_ADDRESS \ -i ssh_address=$IRONIC_VM_SSH_ADDRESS \
-i ssh_port=$IRONIC_VM_SSH_PORT \ -i ssh_port=$IRONIC_VM_SSH_PORT \
-i ssh_username=$IRONIC_SSH_USERNAME \ -i ssh_username=$IRONIC_SSH_USERNAME \
-i ssh_key_filename=$IRONIC_KEY_FILE" -i ssh_key_filename=$IRONIC_KEY_FILE"
fi fi
node_options="\
$node_options \
-i deploy_kernel=$IRONIC_DEPLOY_KERNEL_ID \
-i deploy_ramdisk=$IRONIC_DEPLOY_RAMDISK_ID"
else else
local ironic_node_cpu=$IRONIC_HW_NODE_CPU local ironic_node_cpu=$IRONIC_HW_NODE_CPU