Fixes to virtual-offline-pike-ovs-dpdk/ssl model
- align dpdk lcore mask with available cpus
- add hugepages
- add dpdk interface on compute
- delete unused nginx from cfg node
Change-Id: I476e3e785eef2790ad8cc7c522c25b12466ac1a2
Closes-Bug: PROD-21450
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 1465125..756524c 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -10,7 +10,6 @@
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
- system.salt.minion.cert.proxy
-- system.sphinx.server.doc.reclass
- system.keystone.client.single
- system.keystone.client.service.aodh
- system.keystone.client.service.ceilometer
@@ -26,7 +25,6 @@
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.stacklightv2_server_cluster
- cluster.virtual-offline-pike-ovs-dpdk.infra.backup.client_common
-- cluster.virtual-offline-pike-ovs-dpdk.openstack.proxy
- cluster.virtual-offline-pike-ovs-dpdk.stacklight.proxy
- cluster.virtual-offline-pike-ovs-dpdk
parameters:
@@ -50,14 +48,6 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- nginx:
- server:
- site:
- nginx_proxy_openstack_web:
- proxy:
- host: prx
- nginx_proxy_openstack_api_heat_cfn:
- enabled: false
salt:
master:
backup: true
@@ -176,11 +166,15 @@
- system.influxdb.database.stacklight
openstack_compute_node01:
params:
+ dpdk0_name: ens5
+ dpdk0_pci: '"0000:05.00"'
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"'
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 e8a17b5..df61570 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
@@ -9,6 +9,7 @@
- system.ceilometer.agent.cluster
- system.prometheus.exporters.libvirt
- cluster.virtual-offline-pike-ovs-dpdk
+- system.nova.compute.nfv.hugepages
- system.nova.compute.nfv.cpu_pinning
- system.nova.compute.nfv.sriov
- system.neutron.compute.nfv.dpdk
@@ -25,14 +26,16 @@
sriov_nic01_numvfs: 16
sriov_nic01_physical_network: physnet3
sriov_unsafe_interrupts: False
- dpdk0_pci: '"0000:04:00"'
nova_cpu_pinning: 0,1,2
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: "0x400"
+ compute_ovs_dpdk_lcore_mask: "0x1"
compute_ovs_memory_channels: "2"
+ compute_hugepages_size: 2M
+ compute_hugepages_count: 600
+ compute_hugepages_mount: /mnt/hugepages_2M
nova:
compute:
@@ -93,9 +96,14 @@
- ${_param:primary_interface}
br-mesh:
enabled: true
- type: bridge
- proto: static
+ type: dpdk_ovs_bridge
address: ${_param:tenant_address}
netmask: 255.255.255.0
- use_interfaces:
- - ${_param:tenant_interface}
+ dpdk0:
+ name: ${_param:dpdk0_name}
+ pci: ${_param:dpdk0_pci}
+ driver: igb_uio
+ bridge: br-mesh
+ enabled: true
+ type: dpdk_ovs_port
+ n_rxq: 2
diff --git a/classes/cluster/virtual-offline-ssl/infra/config.yml b/classes/cluster/virtual-offline-ssl/infra/config.yml
index c0a6e64..3fceea5 100644
--- a/classes/cluster/virtual-offline-ssl/infra/config.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/config.yml
@@ -14,7 +14,6 @@
#-salt/master/formula/pkg/dogtag.yml
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
-- system.sphinx.server.doc.reclass
- system.keystone.client.single
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
@@ -183,11 +182,15 @@
linux_system_codename: xenial
openstack_compute_node01:
params:
+ dpdk0_name: ens5
+ dpdk0_pci: '"0000:05.00"'
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"'
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 87d472e..92395c8 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
@@ -15,6 +15,7 @@
- system.nova.compute.nfv.cpu_pinning
- system.nova.compute.nfv.sriov
- system.neutron.compute.nfv.dpdk
+- system.nova.compute.nfv.hugepages
- system.neutron.compute.nfv.sriov
- system.nova.compute.libvirt.ssl
- cluster.virtual-offline-ssl
@@ -29,14 +30,16 @@
sriov_nic01_numvfs: 16
sriov_nic01_physical_network: physnet3
sriov_unsafe_interrupts: False
- dpdk0_pci: '"0000:04:00"'
nova_cpu_pinning: 0,1,2
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: "0x400"
+ compute_ovs_dpdk_lcore_mask: "0x1"
compute_ovs_memory_channels: "2"
+ compute_hugepages_size: 2M
+ compute_hugepages_count: 600
+ compute_hugepages_mount: /mnt/hugepages_2M
loopback_device_size: 20
nova:
compute:
@@ -92,9 +95,14 @@
- ${_param:primary_interface}
br-mesh:
enabled: true
- type: bridge
- proto: static
+ type: dpdk_ovs_bridge
address: ${_param:tenant_address}
netmask: 255.255.255.0
- use_interfaces:
- - ${_param:tenant_interface}
+ dpdk0:
+ name: ${_param:dpdk0_name}
+ pci: ${_param:dpdk0_pci}
+ driver: igb_uio
+ bridge: br-mesh
+ enabled: true
+ type: dpdk_ovs_port
+ n_rxq: 2