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/0010-aarch64-skip-configuration-of-hugepages.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch') diff --git a/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch index ff5cf7c1..183b642c 100644 --- a/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch +++ b/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch @@ -20,7 +20,7 @@ Signed-off-by: Charalampos Kominos 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml -index 78c4a0a..df23754 100644 +index a2c6fa0..9e8ad09 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml @@ -12,8 +12,8 @@ classes: -- cgit 1.2.3-korg