diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-16 01:11:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-16 01:11:12 +0000 |
| commit | 13b071a86f5c552be17f12ae90ae73b94c1dc741 (patch) | |
| tree | 73e1d786de5cbf3234e6e9bf5c153a2a820f87d7 /patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch | |
| parent | 40f2e0e9a211949b416bf28fab5ae736d199c93b (diff) | |
| parent | a4e42550c023bd746143ba323de2bcc61e758bbb (diff) | |
Merge "u/fuel: Bump & rebase for common reclass rework" into stable/euphrates
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" |