From 763cf5a07027d8c26b597a40051fd9af8fbe3f81 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 26 Sep 2017 05:27:51 +0200 Subject: u/fuel: Bump & rebase for yamllint cleanup Change-Id: I1144c523596feb64251f08375501cdb73a0d76f6 Signed-off-by: Alexandru Avadanii (cherry picked from commit 6dcb09998dae3c3f2a55fc5169fe7dc9010f8a0f) --- ...5-aarch64-skip-configuration-of-hugepages.patch | 76 +++++++++++----------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch') diff --git a/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch index a3211d9b..53abfc4c 100644 --- a/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch +++ b/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch @@ -23,25 +23,25 @@ Signed-off-by: Charalampos Kominos 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 79cea91..1febe8a 100644 +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 -@@ -5,8 +5,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 +@@ -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 ad99447..ea95680 100644 +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 -@@ -100,11 +100,11 @@ parameters: +@@ -102,11 +102,11 @@ parameters: rabbitmq_secret_key: opnfv_secret rabbitmq_admin_password: opnfv_secret rabbitmq_openstack_password: opnfv_secret @@ -50,34 +50,34 @@ index ad99447..ea95680 100644 - 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} ++ # 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 19c7f0b..498cc1d 100644 +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 -@@ -5,8 +5,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 +@@ -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 eff5651..fcec76a 100644 +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 -@@ -94,11 +94,11 @@ parameters: +@@ -96,11 +96,11 @@ parameters: rabbitmq_secret_key: opnfv_secret rabbitmq_admin_password: opnfv_secret rabbitmq_openstack_password: opnfv_secret @@ -86,11 +86,11 @@ index eff5651..fcec76a 100644 - 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} ++ # 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} -- cgit 1.2.3-korg