patches/opnfv-fuel/0018-aarch64-skip-configuration-of-hugepages.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2017 Enea AB and others.
   3 :
   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
  12
  13 The reclass model contains instructions on how to setup nova.conf.
  14 Those instructions need to be overwritten for ARM.
  15
  16 Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
  17 Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
  18 ---
  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(-)
  24
  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 3dd94e6..cfdba30 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 @@ -4,8 +4,8 @@ classes:
  30  - system.linux.system.repo.saltstack.xenial
  31  - system.linux.storage.loopback
  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 ad99447..ea95680 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 @@ -100,11 +100,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 cea8c81..3c48cff 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 @@ -4,8 +4,8 @@ classes:
  66  - system.linux.system.repo.saltstack.xenial
  67  - system.linux.storage.loopback
  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 90e0cf3..c1452b4 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 @@ -94,11 +94,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}