From 8da73521d3b9347a982ea6e77114bba0d0f0adeb Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 18 Dec 2017 22:12:23 +0100 Subject: [baremetal] MaaS: Reduce timeout values `maas_fixup` is already re-entrant, so we can execute it more than once during a commissioning/deploy cycle. Reduce the timeout waiting for all nodes to reach a stable state, so nodes stuck in 'Ready' state instead of reaching 'Deploying' get dealt with sooner (~5 min vs old 30 min). While at it, let `maas_fixup` handle machine deploy as well, so we can catch nodes stuck in 'Ready' state and re-trigger the deploy. Change-Id: Id24cc97b17489835c5846288639a9a6032bd320a Signed-off-by: Alexandru Avadanii --- mcp/patches/0003-maas-region-force-artifact-download.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mcp/patches') diff --git a/mcp/patches/0003-maas-region-force-artifact-download.patch b/mcp/patches/0003-maas-region-force-artifact-download.patch index ecda80a02..56e3bd504 100644 --- a/mcp/patches/0003-maas-region-force-artifact-download.patch +++ b/mcp/patches/0003-maas-region-force-artifact-download.patch @@ -66,8 +66,8 @@ new file mode 100644 +maas login {{ region.admin.username }} \ + http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < \ + /var/lib/maas/.maas_credentials || exit 1 -+# wait max 15 min for service up / image download, 5 min region to rack sync -+wait_for 90 "grep -qzE '(Unable to probe for DHCP servers|DHCP probe complete).*Rack controller' /var/log/maas/rackd.log" ++# wait max 5 min for service up, 15 min image download, 5 min region to rack sync ++wait_for 30 "grep -qzE '(Unable to probe for DHCP servers|DHCP probe complete).*Rack controller' /var/log/maas/rackd.log" +maas opnfv boot-resources import || exit 2 +wait_for 90 "! maas opnfv boot-resources is-importing | grep -q 'true'" +maas opnfv rack-controllers import-boot-images || exit 3 -- cgit 1.2.3-korg