diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-05 00:30:14 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-05 23:41:37 +0100 |
commit | 0bc1111a2d7dba9593d0a00804dba41d37b15481 (patch) | |
tree | 7d3b9def338593bf516aeaca38217fb0c0994e5b /patches/opnfv-fuel/0005-maas-boot-resources-Add-arm64-architecture.patch | |
parent | 0e8a4fc5a553bb55c22590c0620ebfd770394e96 (diff) |
u/fuel: Bump & rebase for MaaS prx et al
Change-Id: Ib2fa3af6c1336ad31868a812abe2b8257f69895c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0005-maas-boot-resources-Add-arm64-architecture.patch')
-rw-r--r-- | patches/opnfv-fuel/0005-maas-boot-resources-Add-arm64-architecture.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0005-maas-boot-resources-Add-arm64-architecture.patch b/patches/opnfv-fuel/0005-maas-boot-resources-Add-arm64-architecture.patch index 91e13434..e11dbee7 100644 --- a/patches/opnfv-fuel/0005-maas-boot-resources-Add-arm64-architecture.patch +++ b/patches/opnfv-fuel/0005-maas-boot-resources-Add-arm64-architecture.patch @@ -16,19 +16,19 @@ 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 ecda80a..a8d27d7 100644 +index 6e6c18f..e75fcaa 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,26 @@ +-@@ -0,0 +1,20 @@ ++@@ -0,0 +1,25 @@ +{%- from "maas/map.jinja" import region with context %} +#!/bin/bash +function wait_for { -@@ -72,3 +72,8 @@ new file mode 100644 +@@ -71,3 +71,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" |