summaryrefslogtreecommitdiffstats
path: root/lib/overcloud-deploy-functions.sh
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-12-21 19:39:51 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-21 19:39:51 +0000
commit6a6e2dee30562e14a99bf979b65e6817ad08d75a (patch)
treeb257d9833d2623a619341d5de7c25964f80b029f /lib/overcloud-deploy-functions.sh
parentffb4f46e5ea022e0688cce672395f2dde409e88e (diff)
parent4e1320c4235476d7e2a0a90f80997e8371c5f399 (diff)
Merge "Adds declaring disk device to use on overcloud nodes"
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
-rwxr-xr-xlib/overcloud-deploy-functions.sh16
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 80557eb6..23c6eaf3 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -289,11 +289,19 @@ openstack overcloud image upload
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}"