Merge "Adds declaring disk device to use on overcloud nodes"

diff --combined lib/overcloud-deploy-functions.sh
index 80557eb,e1e6630..23c6eaf
--- 1/lib/overcloud-deploy-functions.sh
--- 2/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@@ -134,7 -134,7 +134,7 @@@ EO
                ;;
        boron)  odl_version='boron'
                ;;
 -      cabron) odl_version='master'
 +      carbon) odl_version='master'
                ;;
        *) echo -e "${red}Invalid ODL version ${deploy_options_array['odl_version']}.  Please use 'carbon' or 'boron' values.${reset}"
           exit 1
@@@ -289,11 -289,19 +289,19 @@@ openstack overcloud image uploa
  
  echo "Configuring undercloud and discovering nodes"
  openstack baremetal import --json instackenv.json
- openstack baremetal configure boot
+ 
  bash -x set_perf_images.sh ${performance_roles[@]}
- #if [[ -z "$virtual" ]]; then
- #  openstack baremetal introspection bulk start
- #fi
+ if [[ -z "$virtual" ]]; then
+   openstack baremetal introspection bulk start
+   if [[ -n "$root_disk_list" ]]; then
+     openstack baremetal configure boot -root-device=${root_disk_list}
+   else
+     openstack baremetal configure boot
+   fi
+ else
+   openstack baremetal configure boot
+ fi
+ 
  echo "Configuring flavors"
  for flavor in baremetal control compute; do
    echo -e "${blue}INFO: Updating flavor: \${flavor}${reset}"