diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-15 16:23:49 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-16 00:08:16 +0000 |
commit | a4e42550c023bd746143ba323de2bcc61e758bbb (patch) | |
tree | c02bcdac5d5de9d74308a0f4e79b6663047c4f4b /patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch | |
parent | 6e71b19097781a7190bcec015afc62be7961fa43 (diff) |
u/fuel: Bump & rebase for common reclass rework
Change-Id: Id7d125b746e97d6e186a7890a4c2f599e24a186c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 783585e0379cffbfe0fe242a4daab9f5c4ab1547)
Diffstat (limited to 'patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch')
-rw-r--r-- | patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch b/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch index 1b0f1137..91e13434 100644 --- a/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch +++ b/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch @@ -16,10 +16,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mcp/patches/0003-maas-region-force-artifact-download.patch b/mcp/patches/0003-maas-region-force-artifact-download.patch -index f0ce50f..9997552 100644 +index ecda80a..a8d27d7 100644 --- a/mcp/patches/0003-maas-region-force-artifact-download.patch +++ b/mcp/patches/0003-maas-region-force-artifact-download.patch -@@ -42,7 +42,7 @@ diff --git a/maas/files/maas-artifact-sync.sh b/maas/files/maas-artifact-sync.sh +@@ -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 @@ -28,7 +28,7 @@ index f0ce50f..9997552 100644 +{%- from "maas/map.jinja" import region with context %} +#!/bin/bash +function wait_for { -@@ -64,3 +64,8 @@ new file mode 100644 +@@ -72,3 +72,8 @@ new file mode 100644 +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" |