Merge "Align dpdk model to underlay"
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
index 756524c..4d2a53c 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -167,14 +167,14 @@
openstack_compute_node01:
params:
dpdk0_name: ens5
- dpdk0_pci: '"0000:05.00"'
+ dpdk0_pci: '"0000:00:05.0"'
single_address: 172.16.10.105
tenant_address: 10.1.0.105
external_address: 10.16.0.105
openstack_compute_node02:
params:
dpdk0_name: ens5
- dpdk0_pci: '"0000:05.00"'
+ dpdk0_pci: '"0000:00:05.0"'
single_address: 172.16.10.106
tenant_address: 10.1.0.106
external_address: 10.16.0.106
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
index 765e74c..5a0c6dc 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
@@ -20,15 +20,15 @@
external_interface: ens6
interface_mtu: 1500
linux_system_codename: xenial
- nova_cpu_pinning: 0,1,2
+ nova_cpu_pinning: 3
compute_dpdk_driver: uio
compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
compute_ovs_pmd_cpu_mask: "0x6"
compute_ovs_dpdk_socket_mem: "1024"
- compute_ovs_dpdk_lcore_mask: "0x1"
+ compute_ovs_dpdk_lcore_mask: "0xF"
compute_ovs_memory_channels: "2"
compute_hugepages_size: 2M
- compute_hugepages_count: 600
+ compute_hugepages_count: 2048
compute_hugepages_mount: /mnt/hugepages_2M
nova:
@@ -95,6 +95,8 @@
netmask: 255.255.255.0
dpdk0:
name: ${_param:dpdk0_name}
+ ipflush_onchange: true
+ restart_on_ipflush: true
pci: ${_param:dpdk0_pci}
driver: igb_uio
bridge: br-mesh
diff --git a/classes/cluster/virtual-offline-ssl/infra/config.yml b/classes/cluster/virtual-offline-ssl/infra/config.yml
index 668adbc..da9d6e3 100644
--- a/classes/cluster/virtual-offline-ssl/infra/config.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/config.yml
@@ -190,14 +190,14 @@
openstack_compute_node01:
params:
dpdk0_name: ens5
- dpdk0_pci: '"0000:05.00"'
+ dpdk0_pci: '"0000:00:05.0"'
single_address: 172.16.10.105
tenant_address: 10.1.0.105
external_address: 10.16.0.105
openstack_compute_node02:
params:
dpdk0_name: ens5
- dpdk0_pci: '"0000:05.00"'
+ dpdk0_pci: '"0000:00:05.0"'
single_address: 172.16.10.106
tenant_address: 10.1.0.106
external_address: 10.16.0.106
diff --git a/classes/cluster/virtual-offline-ssl/openstack/compute.yml b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
index 0711dc7..dbb1e58 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
@@ -24,15 +24,15 @@
external_interface: ens6
interface_mtu: 1500
linux_system_codename: xenial
- nova_cpu_pinning: 0,1,2
+ nova_cpu_pinning: 3
compute_dpdk_driver: uio
compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
compute_ovs_pmd_cpu_mask: "0x6"
compute_ovs_dpdk_socket_mem: "1024"
- compute_ovs_dpdk_lcore_mask: "0x1"
+ compute_ovs_dpdk_lcore_mask: '0xF'
compute_ovs_memory_channels: "2"
compute_hugepages_size: 2M
- compute_hugepages_count: 600
+ compute_hugepages_count: 2048
compute_hugepages_mount: /mnt/hugepages_2M
loopback_device_size: 20
nova:
@@ -89,6 +89,8 @@
- ${_param:primary_interface}
br-mesh:
enabled: true
+ ipflush_onchange: true
+ restart_on_ipflush: true
type: dpdk_ovs_bridge
address: ${_param:tenant_address}
netmask: 255.255.255.0