X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fpatches%2F0003-maas-region-force-artifact-download.patch;h=b61a3d1b8128db54173a6b185beb7cf9fcec20af;hb=a854b61568c2f615672f17868e2cfe31d97c751f;hp=f0ce50fa0facd0d1a4e7d7f22f0ae2b12cc263dd;hpb=294f3037736ca612113ece94bf555e8d571ea05c;p=fuel.git

diff --git a/mcp/patches/0003-maas-region-force-artifact-download.patch b/mcp/patches/0003-maas-region-force-artifact-download.patch
index f0ce50fa0..b61a3d1b8 100644
--- a/mcp/patches/0003-maas-region-force-artifact-download.patch
+++ b/mcp/patches/0003-maas-region-force-artifact-download.patch
@@ -1,3 +1,11 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 Date: Sat, 5 Aug 2017 02:03:01 +0200
 Subject: [PATCH] maas: region: force artifact download
@@ -42,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 {
@@ -58,9 +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"
-+maas opnfv boot-resources import || exit 2
++# wait max 5 min for service up, 15 min image download, 5 min region to rack sync
++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"