Change virtual-mcp11-ovs-dpdk
Add 2 numa pools for cmp01, cmp02
Set 12 cores for cmp01, cmp02
Change-Id: Icb88463b53da8e4a62bc77e183ff2e26be8c7579
Reviewed-on: https://review.gerrithub.io/363396
Reviewed-by: Tatyanka Leontovich <tleontovich@mirantis.com>
Tested-by: Tatyanka Leontovich <tleontovich@mirantis.com>
diff --git a/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay--user-data1604.yaml b/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay--user-data1604.yaml
index 22b9d19..5fd85c0 100644
--- a/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay--user-data1604.yaml
@@ -58,7 +58,10 @@
- eatmydata apt-get update && apt-get -y upgrade
# Install common packages
- - eatmydata apt-get install -y python-pip git curl tmux byobu iputils-ping traceroute htop tree mc
+ - eatmydata apt-get install -y python-pip git curl tmux byobu iputils-ping traceroute htop tree mc hugepages
+
+ # Enable on nodes hugepages
+ - echo 2048 > /proc/sys/vm/nr_hugepages
########################################################
# Node is ready, allow SSH access
diff --git a/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay.yaml b/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay.yaml
index 4c31e25..4f7b55f 100644
--- a/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay.yaml
@@ -104,7 +104,8 @@
connection_string: !os_env CONNECTION_STRING, qemu:///system
storage_pool_name: !os_env STORAGE_POOL_NAME, default
stp: False
- hpet: False
+ hpet: True
+ use_hugepages: True
enable_acpi: true
use_host_cpu: !os_env DRIVER_USE_HOST_CPU, true
@@ -313,8 +314,13 @@
- name: {{ HOSTNAME_CMP01 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 4096
+ vcpu: !os_env SLAVE_NODE_CPU, 12
+ memory: !os_env SLAVE_NODE_MEMORY, 8192
+ numa:
+ - cpus: 0,1,2,3,4,5
+ memory: 4096
+ - cpus: 6,7,8,9,10,11
+ memory: 4096
boot:
- hd
cloud_init_volume_name: iso
@@ -364,8 +370,13 @@
- name: {{ HOSTNAME_CMP02 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 4096
+ vcpu: !os_env SLAVE_NODE_CPU, 12
+ memory: !os_env SLAVE_NODE_MEMORY, 8192
+ numa:
+ - cpus: 0,1,2,3,4,5
+ memory: 4096
+ - cpus: 6,7,8,9,10,11
+ memory: 4096
boot:
- hd
cloud_init_volume_name: iso