summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-26 18:22:06 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-28 03:29:48 +0000
commit3b19e08d3e10519efee7f3c9d40a740318f762dc (patch)
tree1858f8f17f308a94ab6fbdce65858eb314aee01d /patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch
parent763cf5a07027d8c26b597a40051fd9af8fbe3f81 (diff)
u/fuel: Bump & rebase for full PDF support
Change-Id: I7ae833b429c018345d0ab061877d27e3183b3dc7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 62d2ed716e79f9ee75d63543249bb21b9115b032)
Diffstat (limited to 'patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch')
-rw-r--r--patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch96
1 files changed, 0 insertions, 96 deletions
diff --git a/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch
deleted file mode 100644
index 53abfc4c..00000000
--- a/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 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: Charalampos Kominos <charalampos.kominos@enea.com>
-Date: Thu, 24 Aug 2017 19:28:14 +0200
-Subject: [PATCH] aarch64: skip configuration of hugepages
-
-The reclass model contains instructions on how to setup nova.conf.
-Those instructions need to be overwritten for ARM.
-
-Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
-Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
----
- .../cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml | 4 ++--
- .../cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml | 10 +++++-----
- .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml | 4 ++--
- .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml | 10 +++++-----
- 4 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-index 605bfe1..51f5635 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-@@ -6,8 +6,8 @@ classes:
- - system.linux.storage.loopback
- - system.glusterfs.client.cluster
- - system.nova.compute.cluster
-- - system.nova.compute.nfv.hugepages
-- - system.nova.compute.nfv.cpu_pinning
-+ # - system.nova.compute.nfv.hugepages
-+ # - system.nova.compute.nfv.cpu_pinning
- - system.neutron.gateway.opendaylight.single
- - system.neutron.gateway.cluster
- - system.cinder.volume.single
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-index e288322..a40d23e 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-@@ -102,11 +102,11 @@ parameters:
- rabbitmq_secret_key: opnfv_secret
- rabbitmq_admin_password: opnfv_secret
- rabbitmq_openstack_password: opnfv_secret
-- nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
-- compute_hugepages_size: 1G
-- compute_hugepages_count: 16
-- compute_hugepages_mount: /mnt/hugepages_1G
-- compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
-+ # nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
-+ # compute_hugepages_size: 1G
-+ # compute_hugepages_count: 16
-+ # compute_hugepages_mount: /mnt/hugepages_1G
-+ # compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
- glance_version: ${_param:openstack_version}
- glance_service_host: ${_param:openstack_control_address}
- keystone_version: ${_param:openstack_version}
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-index e3f0cff..6ed1622 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-@@ -6,8 +6,8 @@ classes:
- - system.linux.storage.loopback
- - system.glusterfs.client.cluster
- - system.nova.compute.cluster
-- - system.nova.compute.nfv.hugepages
-- - system.nova.compute.nfv.cpu_pinning
-+ # - system.nova.compute.nfv.hugepages
-+ # - system.nova.compute.nfv.cpu_pinning
- - system.neutron.gateway.cluster
- - system.cinder.volume.single
- - system.cinder.volume.backend.lvm
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
-index 7ce282b..9401f60 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
-@@ -96,11 +96,11 @@ parameters:
- rabbitmq_secret_key: opnfv_secret
- rabbitmq_admin_password: opnfv_secret
- rabbitmq_openstack_password: opnfv_secret
-- nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
-- compute_hugepages_size: 1G
-- compute_hugepages_count: 16
-- compute_hugepages_mount: /mnt/hugepages_1G
-- compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
-+ # nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
-+ # compute_hugepages_size: 1G
-+ # compute_hugepages_count: 16
-+ # compute_hugepages_mount: /mnt/hugepages_1G
-+ # compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
- glance_version: ${_param:openstack_version}
- glance_service_host: ${_param:openstack_control_address}
- keystone_version: ${_param:openstack_version}