1 From: Charalampos Kominos <charalampos.kominos@enea.com>
2 Date: Thu, 24 Aug 2017 19:28:14 +0200
3 Subject: [PATCH] aarch64: skip configuration of hugepages
5 The reclass model contains instructions on how to setup nova.conf.
6 Those instructions need to be overwritten for ARM.
8 Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
9 Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
11 .../cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml | 4 ++--
12 .../cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml | 10 +++++-----
13 .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml | 4 ++--
14 .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml | 10 +++++-----
15 4 files changed, 14 insertions(+), 14 deletions(-)
17 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
18 index cd1456a..c53f77f 100644
19 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
20 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
21 @@ -3,8 +3,8 @@ classes:
22 - system.linux.system.repo.mcp.extra
23 - system.linux.system.repo.saltstack.xenial
24 - system.nova.compute.cluster
25 -- system.nova.compute.nfv.hugepages
26 -- system.nova.compute.nfv.cpu_pinning
27 +#- system.nova.compute.nfv.hugepages
28 +#- system.nova.compute.nfv.cpu_pinning
29 - system.neutron.gateway.opendaylight.single
30 - system.neutron.gateway.cluster
31 - system.ceilometer.agent.cluster
32 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
33 index ad99447..ea95680 100644
34 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
35 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
36 @@ -100,11 +100,11 @@ parameters:
37 rabbitmq_secret_key: opnfv_secret
38 rabbitmq_admin_password: opnfv_secret
39 rabbitmq_openstack_password: opnfv_secret
40 - nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
41 - compute_hugepages_size: 1G
42 - compute_hugepages_count: 16
43 - compute_hugepages_mount: /mnt/hugepages_1G
44 - compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
45 + #nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
46 + #compute_hugepages_size: 1G
47 + #compute_hugepages_count: 16
48 + #compute_hugepages_mount: /mnt/hugepages_1G
49 + #compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
50 glance_version: ${_param:openstack_version}
51 glance_service_host: ${_param:openstack_control_address}
52 keystone_version: ${_param:openstack_version}
53 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
54 index 88150b0..8bcb469 100644
55 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
56 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
57 @@ -3,8 +3,8 @@ classes:
58 - system.linux.system.repo.mcp.extra
59 - system.linux.system.repo.saltstack.xenial
60 - system.nova.compute.cluster
61 -- system.nova.compute.nfv.hugepages
62 -- system.nova.compute.nfv.cpu_pinning
63 +#- system.nova.compute.nfv.hugepages
64 +#- system.nova.compute.nfv.cpu_pinning
65 - system.neutron.gateway.cluster
66 - system.ceilometer.agent.cluster
67 - cluster.baremetal-mcp-ocata-ovs-ha.infra
68 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
69 index 90e0cf3..c1452b4 100644
70 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
71 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
72 @@ -94,11 +94,11 @@ parameters:
73 rabbitmq_secret_key: opnfv_secret
74 rabbitmq_admin_password: opnfv_secret
75 rabbitmq_openstack_password: opnfv_secret
76 - nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
77 - compute_hugepages_size: 1G
78 - compute_hugepages_count: 16
79 - compute_hugepages_mount: /mnt/hugepages_1G
80 - compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
81 + # nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
82 + # compute_hugepages_size: 1G
83 + # compute_hugepages_count: 16
84 + # compute_hugepages_mount: /mnt/hugepages_1G
85 + # compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
86 glance_version: ${_param:openstack_version}
87 glance_service_host: ${_param:openstack_control_address}
88 keystone_version: ${_param:openstack_version}