From 5f55422dcdae61c7b5358a66e265b01eb2c9d3fe Mon Sep 17 00:00:00 2001
From: Dao Cong Tien <tiendc@vn.fujitsu.com>
Date: Fri, 16 Mar 2018 16:53:17 +0700
Subject: [PATCH] Follow-up patch for rescue mode devstack change

This patch addresses an issue from the PS30 of
I332223f187783fc06e19e62a886a8a7378c62cf2

Change-Id: I86c55ec8a2f2445616dbae44a4a9f0723eaffb0f
---
 devstack/lib/ironic | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 1e3b157857..52119a92aa 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -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 \