Increase cpu and mem for dpdk
Currently in those models we run with 3 cpu and 4g of memory
In a fact this is not enaught as we also host openstack services
on top of this node
Change-Id: Ib7e05fd77afe0c40406175e80b677d8d711f765b
diff --git a/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/openstack.yaml b/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/openstack.yaml
index 37c9b58..cb188b8 100644
--- a/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/openstack.yaml
+++ b/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/openstack.yaml
@@ -189,13 +189,6 @@
retry: {count: 10, delay: 30}
skip_fail: false
-- description: Workaround to avoid reboot cmp nodes bring OVS interfaces UP
- cmd: |
- salt 'cmp*' cmd.run "ifup br-mesh";
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 10}
- skip_fail: false
-
# Upload cirros image
# Configure cinder-volume salt-call
- description: Set disks 01
@@ -375,5 +368,6 @@
retry: {count: 1, delay: 30}
skip_fail: false
+{{ BACKUP.MACRO_WR_NGINX_MASTER() }}
{{ BACKUP.MACRO_BACKUP_BACKUPNINJA() }}
{{ BACKUP.MACRO_BACKUP_XTRABACKUP() }}
\ No newline at end of file
diff --git a/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/salt.yaml b/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/salt.yaml
index f97830a..74679f9 100644
--- a/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/salt.yaml
+++ b/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/salt.yaml
@@ -72,3 +72,15 @@
{{ VSWITCH.MACRO_ENABLE_L2GW(SHARED.CLUSTER_NAME, VSWITCH_IP) }}
+- description: Enable hugepages on cmp nodes
+ cmd: salt 'cmp*' cmd.run "apt-get install -y hugepages; echo 2048 > /proc/sys/vm/nr_hugepages";
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 10}
+ skip_fail: false
+
+- description: Workaround to avoid reboot cmp nodes bring OVS interfaces UP
+ cmd: |
+ salt 'cmp*' cmd.run "ifup br-mesh";
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 10}
+ skip_fail: false
\ No newline at end of file
diff --git a/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay.yaml b/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay.yaml
index 17911fa..178ef29 100644
--- a/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay.yaml
+++ b/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay.yaml
@@ -376,10 +376,12 @@
- name: {{ HOSTNAME_CMP01 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 3
+ vcpu: !os_env SLAVE_NODE_CPU, 12
memory: !os_env SLAVE_NODE_MEMORY, 8192
numa:
- - cpus: 0,1,2
+ - cpus: 0,1,2,3,4,5
+ memory: 4096
+ - cpus: 6,7,8,9,10,11
memory: 4096
boot:
- hd
@@ -430,10 +432,12 @@
- name: {{ HOSTNAME_CMP02 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 3
+ vcpu: !os_env SLAVE_NODE_CPU, 12
memory: !os_env SLAVE_NODE_MEMORY, 8192
numa:
- - cpus: 0,1,2
+ - cpus: 0,1,2,3,4,5
+ memory: 4096
+ - cpus: 6,7,8,9,10,11
memory: 4096
boot:
- hd