1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2 : Copyright (c) 2017 Enea AB and others.
4 : All rights reserved. This program and the accompanying materials
5 : are made available under the terms of the Apache License, Version 2.0
6 : which accompanies this distribution, and is available at
7 : http://www.apache.org/licenses/LICENSE-2.0
8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
9 From: Charalampos Kominos <charalampos.kominos@enea.com>
10 Date: Thu, 24 Aug 2017 19:28:14 +0200
11 Subject: [PATCH] aarch64: skip configuration of hugepages
13 The reclass model contains instructions on how to setup nova.conf.
14 Those instructions need to be overwritten for ARM.
16 Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
17 Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
19 .../cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml | 4 ++--
20 .../cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml | 10 +++++-----
21 .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml | 4 ++--
22 .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml | 10 +++++-----
23 4 files changed, 14 insertions(+), 14 deletions(-)
25 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
26 index e2179ee..e4aaba1 100644
27 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
28 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
29 @@ -5,8 +5,8 @@ classes:
30 - system.linux.storage.loopback
31 - system.glusterfs.client.cluster
32 - system.nova.compute.cluster
33 - - system.nova.compute.nfv.hugepages
34 - - system.nova.compute.nfv.cpu_pinning
35 + # - system.nova.compute.nfv.hugepages
36 + # - system.nova.compute.nfv.cpu_pinning
37 - system.neutron.gateway.opendaylight.single
38 - system.neutron.gateway.cluster
39 - system.cinder.volume.single
40 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
41 index c7df472..4db9ee0 100644
42 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
43 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
44 @@ -102,11 +102,11 @@ parameters:
45 rabbitmq_secret_key: opnfv_secret
46 rabbitmq_admin_password: opnfv_secret
47 rabbitmq_openstack_password: opnfv_secret
48 - nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
49 - compute_hugepages_size: 1G
50 - compute_hugepages_count: 16
51 - compute_hugepages_mount: /mnt/hugepages_1G
52 - compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
53 + # nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
54 + # compute_hugepages_size: 1G
55 + # compute_hugepages_count: 16
56 + # compute_hugepages_mount: /mnt/hugepages_1G
57 + # compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
58 glance_version: ${_param:openstack_version}
59 glance_service_host: ${_param:openstack_control_address}
60 keystone_version: ${_param:openstack_version}
61 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
62 index 36465cd..5c01d2d 100644
63 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
64 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
65 @@ -5,8 +5,8 @@ classes:
66 - system.linux.storage.loopback
67 - system.glusterfs.client.cluster
68 - system.nova.compute.cluster
69 - - system.nova.compute.nfv.hugepages
70 - - system.nova.compute.nfv.cpu_pinning
71 + # - system.nova.compute.nfv.hugepages
72 + # - system.nova.compute.nfv.cpu_pinning
73 - system.neutron.gateway.cluster
74 - system.cinder.volume.single
75 - system.cinder.volume.backend.lvm
76 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
77 index 7ce282b..9401f60 100644
78 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
79 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
80 @@ -96,11 +96,11 @@ parameters:
81 rabbitmq_secret_key: opnfv_secret
82 rabbitmq_admin_password: opnfv_secret
83 rabbitmq_openstack_password: opnfv_secret
84 - nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
85 - compute_hugepages_size: 1G
86 - compute_hugepages_count: 16
87 - compute_hugepages_mount: /mnt/hugepages_1G
88 - compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
89 + # nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
90 + # compute_hugepages_size: 1G
91 + # compute_hugepages_count: 16
92 + # compute_hugepages_mount: /mnt/hugepages_1G
93 + # compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
94 glance_version: ${_param:openstack_version}
95 glance_service_host: ${_param:openstack_control_address}
96 keystone_version: ${_param:openstack_version}