summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-02 06:03:48 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-03 04:54:04 +0100
commitbf5e0b539fafdc2bf26bb1b0d49327f851c62fb3 (patch)
tree44a6ef37ba38cb93ef7b2522f346ca6848121c37 /patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch
parent6eab8c989c257213586347f284362cc43f99d3f4 (diff)
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch')
-rw-r--r--patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch2
1 files changed, 1 insertions, 1 deletions
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 <charalampos.kominos@enea.com>
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: