From 0bd1adfbf11d58414b96d0277386b039a3117a9e Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 23 May 2018 19:29:25 +0200 Subject: u/fuel: Bump & rebase for maas.machines.storage Change-Id: I22781c20f353a81e546b1d6de390e6c58b31a494 Signed-off-by: Alexandru Avadanii --- ...aas-boot-resources-Add-arm64-architecture.patch | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 patches/opnfv-fuel/0004-maas-boot-resources-Add-arm64-architecture.patch (limited to 'patches/opnfv-fuel/0004-maas-boot-resources-Add-arm64-architecture.patch') diff --git a/patches/opnfv-fuel/0004-maas-boot-resources-Add-arm64-architecture.patch b/patches/opnfv-fuel/0004-maas-boot-resources-Add-arm64-architecture.patch deleted file mode 100644 index b13390f4..00000000 --- a/patches/opnfv-fuel/0004-maas-boot-resources-Add-arm64-architecture.patch +++ /dev/null @@ -1,39 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2018 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 -Date: Fri, 11 Aug 2017 00:07:29 +0200 -Subject: [PATCH] maas: boot-resources: Add arm64 architecture - -Signed-off-by: Alexandru Avadanii ---- - mcp/patches/0003-maas-region-force-artifact-download.patch | 7 ++++++- - 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 b61a3d1b..e38b6c1a 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,20 @@ -+@@ -0,0 +1,25 @@ - +{%- from "maas/map.jinja" import region with context %} - +#!/bin/bash - +function wait_for { -@@ -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" -++maas opnfv boot-source-selection update 1 1 arches='amd64' arches='arm64' || exit 4 -++maas opnfv boot-resources import || exit 2 -++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/arm64" -- cgit 1.2.3-korg