diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-28 19:45:08 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-28 19:48:36 +0200 |
commit | 2da79800d8ee9bc4210740255a42f7ec7a65c072 (patch) | |
tree | 4ea8e4651f485b918a2fe51732583c511e852eb0 /patches/opnfv-fuel/0020-aarch64-skip-configuration-of-hugepages.patch | |
parent | e0d9c392488c74393574fcd93ad1f8a3ad576130 (diff) |
p/fuel: Rebase for os cacert
While rebasing, drop batch apply of linux.network state for VCP nodes,
as it does not fix the underlying problem and only introduces extra
delay.
Reverts commits: 4f1bfdd
Change-Id: I365b029aa2855334e295907cdde623b1717fc69a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0020-aarch64-skip-configuration-of-hugepages.patch')
-rw-r--r-- | patches/opnfv-fuel/0020-aarch64-skip-configuration-of-hugepages.patch | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/patches/opnfv-fuel/0020-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0020-aarch64-skip-configuration-of-hugepages.patch deleted file mode 100644 index 2f7f720b..00000000 --- a/patches/opnfv-fuel/0020-aarch64-skip-configuration-of-hugepages.patch +++ /dev/null @@ -1,88 +0,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 cd1456a..c53f77f 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 -@@ -3,8 +3,8 @@ classes: - - system.linux.system.repo.mcp.extra - - system.linux.system.repo.saltstack.xenial - - 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.ceilometer.agent.cluster -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 ad99447..ea95680 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 -@@ -100,11 +100,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 88150b0..8bcb469 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 -@@ -3,8 +3,8 @@ classes: - - system.linux.system.repo.mcp.extra - - system.linux.system.repo.saltstack.xenial - - 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.ceilometer.agent.cluster - - cluster.baremetal-mcp-ocata-ovs-ha.infra -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 90e0cf3..c1452b4 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 -@@ -94,11 +94,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} |