diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-29 02:58:25 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-03 03:04:41 +0100 |
| commit | faa82bb7a3fc85b6e7dbd5adeae76d18043ff161 (patch) | |
| tree | 3270d330ce9e8bee350d95827e77b99e55571e63 | |
| parent | 34f5b2bb04ece0f18898855c1428b94da62c007f (diff) | |
[maas] artifact sync: improve barrier condition
Simplify wait condition for MaaS service up, since it's fragile
and often adds extra time when not really needed.
Instead, retry starting boot image import right away.
Change-Id: I131d6c82127449cecf6685d4cc7484a366e658c6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit fedeebd6ee0e3a342777812b7ea90bd4988787ad)
| -rw-r--r-- | mcp/patches/0003-maas-region-force-artifact-download.patch | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mcp/patches/0003-maas-region-force-artifact-download.patch b/mcp/patches/0003-maas-region-force-artifact-download.patch index 56e3bd504..6e6c18fba 100644 --- a/mcp/patches/0003-maas-region-force-artifact-download.patch +++ b/mcp/patches/0003-maas-region-force-artifact-download.patch @@ -50,7 +50,7 @@ diff --git a/maas/files/maas-artifact-sync.sh b/maas/files/maas-artifact-sync.sh new file mode 100644 --- /dev/null +++ b/maas/files/maas-artifact-sync.sh -@@ -0,0 +1,21 @@ +@@ -0,0 +1,20 @@ +{%- from "maas/map.jinja" import region with context %} +#!/bin/bash +function wait_for { @@ -67,8 +67,7 @@ new file mode 100644 + http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < \ + /var/lib/maas/.maas_credentials || exit 1 +# 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 30 "maas opnfv boot-resources import" +wait_for 90 "! maas opnfv boot-resources is-importing | grep -q 'true'" +maas opnfv rack-controllers import-boot-images || exit 3 +wait_for 30 "test -d /var/lib/maas/boot-resources/current/ubuntu/amd64" |