From a3b62a26aefbb2f29ea760111c13728651f92b0a Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Fri, 23 Feb 2018 13:56:48 +0000 Subject: [PATCH] Create NOVA_READY_TIMEOUT in is_nova_ready function The function was introduced in [0] using a hardcoded timeout of 60 seconds which turns out to be too small on slow machines. Create a new global variable NOVA_READY_TIMEOUT instead so that users can override the timeout if necessary. [0] I32eb59b9d6c225a3e93992be3a3b9f4b251d7189 Co-Authored-By: Mohammed Naser Change-Id: I0cd7f193589a1a0776ae76dc30cecefe7ba9e5db --- lib/nova | 2 +- stackrc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/nova b/lib/nova index 4dcd8eb7e4..bc8b1432c7 100644 --- a/lib/nova +++ b/lib/nova @@ -963,7 +963,7 @@ function is_nova_ready { # because of the dom0/domU split. Just ignore for now. return fi - wait_for_compute 60 + wait_for_compute $NOVA_READY_TIMEOUT } function start_nova { diff --git a/stackrc b/stackrc index 83be1bde75..b8a510ce8a 100644 --- a/stackrc +++ b/stackrc @@ -778,6 +778,9 @@ fi # Service startup timeout SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60} +# Timeout for compute node registration in Nova +NOVA_READY_TIMEOUT=${NOVA_READY_TIMEOUT:-$SERVICE_TIMEOUT} + # Service graceful shutdown timeout SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT=${SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT:-5}