... | ... |
@@ -407,20 +407,6 @@ EOF |
407 | 407 |
return $rval |
408 | 408 |
} |
409 | 409 |
|
410 |
-function wait_for_compute { |
|
411 |
- local timeout=$1 |
|
412 |
- time_start "wait_for_service" |
|
413 |
- timeout $timeout bash -x <<EOF || rval=$? |
|
414 |
- ID="" |
|
415 |
- while [[ "\$ID" == "" ]]; do |
|
416 |
- sleep 1 |
|
417 |
- ID=\$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" compute service list --host `hostname` --service nova-compute -c ID -f value) |
|
418 |
- done |
|
419 |
-EOF |
|
420 |
- time_stop "wait_for_service" |
|
421 |
- return $rval |
|
422 |
-} |
|
423 |
- |
|
424 | 410 |
|
425 | 411 |
# ping check |
426 | 412 |
# Uses globals ``ENABLED_SERVICES``, ``TOP_DIR``, ``MULTI_HOST``, ``PRIVATE_NETWORK`` |
... | ... |
@@ -871,13 +871,6 @@ function start_nova_compute { |
871 | 871 |
fi |
872 | 872 |
run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $NOVA_CPU_CONF" |
873 | 873 |
fi |
874 |
- # NOTE(sdague): with cells v2 all the compute services must be up |
|
875 |
- # and checked into the database before discover_hosts is run. This |
|
876 |
- # happens in all in one installs by accident, because > 30 seconds |
|
877 |
- # happen between here and the script ending. However, in multinode |
|
878 |
- # tests this can very often not be the case. So ensure that the |
|
879 |
- # compute is up before we move on. |
|
880 |
- wait_for_compute 60 |
|
881 | 874 |
|
882 | 875 |
export PATH=$old_path |
883 | 876 |
} |