Skip to content

Commit 6f38cf4

Browse files
committed
Fix wait_for_compute to work for modified compute host name
When we change the name of compute host then devstack is breaking because it is using default host name from host. How to change compute host name in local.conf [[post-config|$NOVA_CONF]] [DEFAULT] host = foo Change-Id: I4d4392f1f58f0431b10764610668565af88d392f Signed-off-by: Prabhat Ranjan <pranjank@in.ibm.com>
1 parent 5ebfe6d commit 6f38cf4

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

functions

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,12 @@ EOF
441441
function wait_for_compute {
442442
local timeout=$1
443443
local rval=0
444+
local compute_hostname
444445
time_start "wait_for_service"
446+
compute_hostname=$(iniget $NOVA_CONF DEFAULT host)
447+
if [[ -z $compute_hostname ]]; then
448+
compute_hostname=$(hostname)
449+
fi
445450
timeout $timeout bash -x <<EOF || rval=$?
446451
ID=""
447452
while [[ "\$ID" == "" ]]; do
@@ -450,7 +455,7 @@ function wait_for_compute {
450455
# When using the fake driver the compute hostnames have a suffix of 1 to NUMBER_FAKE_NOVA_COMPUTE
451456
ID=\$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" compute service list --host `hostname`1 --service nova-compute -c ID -f value)
452457
else
453-
ID=\$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" compute service list --host `hostname` --service nova-compute -c ID -f value)
458+
ID=\$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" compute service list --host "$compute_hostname" --service nova-compute -c ID -f value)
454459
fi
455460
done
456461
EOF

0 commit comments

Comments
 (0)