p/fuel: Rebase: openstack_ha upstream sync

[armband.git] / patches / opnfv-fuel / 0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch

diff --git a/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch b/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch
index 48981c3..74fed68 100644 (file)
--- a/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch
+++ b/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch
@@ -2,20 +2,18 @@ From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 Date: Tue, 11 Jul 2017 18:24:24 +0200
 Subject: [PATCH] mcp/config: AArch64: Use UEFI arm64 image
 
-Also, allow removal of VMs booted via guest UEFI (OVMF or AAVMF).
 While at it, bump default vCPU number from 2 to 6.
 
 Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/config/defaults.yaml | 4 ++--
- mcp/scripts/lib.sh       | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ mcp/config/scenario/virtual/defaults.yaml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/mcp/config/defaults.yaml b/mcp/config/defaults.yaml
+diff --git a/mcp/config/scenario/virtual/defaults.yaml b/mcp/config/scenario/virtual/defaults.yaml
 index b841e88..17fbbfc 100644
---- a/mcp/config/defaults.yaml
-+++ b/mcp/config/defaults.yaml
+--- a/mcp/config/scenario/virtual/defaults.yaml
++++ b/mcp/config/scenario/virtual/defaults.yaml
 @@ -1,6 +1,6 @@
 -base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
 +base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
@@ -25,16 +23,3 @@ index b841e88..17fbbfc 100644
 +    vcpus: 6
      ram: 4096
 
-diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index 679b997..af57dcc 100644
---- a/mcp/scripts/lib.sh
-+++ b/mcp/scripts/lib.sh
-@@ -18,7 +18,7 @@ cleanup_vms() {
-   # clean up existing nodes
-   for node in $(virsh list --name | grep -P '\w{3}\d{2}'); do
-     virsh destroy $node
--    virsh undefine $node
-+    virsh undefine --nvram $node
-   done
- }
-