From bf5e0b539fafdc2bf26bb1b0d49327f851c62fb3 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 2 Jan 2018 06:03:48 +0100 Subject: u/fuel: Bump & rebase for MaaS proxy support While at it, fix duplicate "file.repl" entry in armband.nova_config SLS and drop upstream nova patch for Qemu 2.10 support previously backported. Fixes: f191bfb Change-Id: Ib4e56833df8e1095396af0856a0fad06f5e9ed1c Signed-off-by: Alexandru Avadanii --- patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch') diff --git a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch index 808ca49c..3054acb5 100644 --- a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch +++ b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch @@ -49,10 +49,10 @@ index 0000000..d40e63b + cmd += 'else sh {0} -c /tmp {1}; fi'.format( + os.path.join(tmppath, 'bootstrap-salt.sh'), arg) diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index fdd3872..daf3368 100644 +index c69567b..a322439 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -17,3 +17,4 @@ +@@ -18,3 +18,4 @@ /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch /usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch /usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch -- cgit 1.2.3-korg