diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-23 15:21:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-23 15:21:41 +0000 |
| commit | 6e28bcea8eca57d6befae2cd272a39564b0311e5 (patch) | |
| tree | f23765b7b6318a4b3eb87039a3e2822f1ee3e394 /mcp/reclass/classes/cluster/all-mcp-arch-common | |
| parent | 9066a682aed937d566f661e975070855aafe5d8f (diff) | |
| parent | 57a62789f6df12998784167c1cb5d0764ef6e9a7 (diff) | |
Merge "Disable cpu pinning & L3 HA features" into stable/fraser
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-arch-common')
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 | 3 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 index 6cf04b33a..703d5350e 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 @@ -24,11 +24,10 @@ parameters: {%- endfor %} {%- endif %} {%- else %} - nova_cpu_pinning: '"5-7,13-15"' compute_hugepages_size: 2M compute_hugepages_count: 8192 compute_hugepages_mount: /mnt/hugepages_2M - compute_kernel_isolcpu: 2,3,5,6,7,10,11,13,14,15 + compute_kernel_isolcpu: 2,3,10,11 compute_dpdk_driver: uio compute_ovs_pmd_cpu_mask: '"0xc04"' compute_ovs_dpdk_socket_mem: '"2048,2048"' diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 index 477c0957b..fb25cc617 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 @@ -25,11 +25,9 @@ parameters: dummy_value: ~ {%- endif %} {%- else %} - nova_cpu_pinning: &nova_cpu_pinning_common '"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: *nova_cpu_pinning_common {%- endif %} openstack_compute_node02: <<: *openstack_compute_node01 |