From a6c64087de2edee87ac8a98438359afcdac844e2 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 6 Mar 2017 17:15:37 -0500 Subject: Fixes OVS DPDK scenarios This fixes nosdn OVS DPDK scenarios to work with OVS 2.6. It also adds support for the ODL DPDK scenario. OVS DPDK configuration is done during preconfig on compute nodes. All nodes make use of first boot script to get kernel params like hugepages. The network settings are modified to use real nic names for the virtual network settings file. This is required due to a timing bug with os-net-config and using first-boot script. The network settings file also contains the UIO driver to use with DPDK. JIRA: APEX-314 opnfv-tht-pr: 117 Change-Id: I46b6fca71ecec38981968133ba2411f64d7c6445 Signed-off-by: Tim Rozet --- config/deploy/os-nosdn-ovs-ha.yaml | 4 ++++ config/deploy/os-nosdn-ovs-noha.yaml | 4 ++++ config/deploy/os-odl_l3-ovs-ha.yaml | 27 +++++++++++++++++++++++++++ config/deploy/os-odl_l3-ovs-noha.yaml | 27 +++++++++++++++++++++++++++ config/network/network_settings.yaml | 15 ++++++++------- 5 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 config/deploy/os-odl_l3-ovs-ha.yaml create mode 100644 config/deploy/os-odl_l3-ovs-noha.yaml (limited to 'config') diff --git a/config/deploy/os-nosdn-ovs-ha.yaml b/config/deploy/os-nosdn-ovs-ha.yaml index a72fef35..c9d58671 100644 --- a/config/deploy/os-nosdn-ovs-ha.yaml +++ b/config/deploy/os-nosdn-ovs-ha.yaml @@ -20,3 +20,7 @@ deploy_options: hugepages: 2048 intel_iommu: 'on' iommu: pt + ovs: + socket_memory: 1024 + pmd_cores: 2 + dpdk_cores: 1 diff --git a/config/deploy/os-nosdn-ovs-noha.yaml b/config/deploy/os-nosdn-ovs-noha.yaml index 7d054cec..cf9b854d 100644 --- a/config/deploy/os-nosdn-ovs-noha.yaml +++ b/config/deploy/os-nosdn-ovs-noha.yaml @@ -20,3 +20,7 @@ deploy_options: hugepages: 2048 intel_iommu: 'on' iommu: pt + ovs: + socket_memory: 1024 + pmd_cores: 2 + dpdk_cores: 1 diff --git a/config/deploy/os-odl_l3-ovs-ha.yaml b/config/deploy/os-odl_l3-ovs-ha.yaml new file mode 100644 index 00000000..ad265699 --- /dev/null +++ b/config/deploy/os-odl_l3-ovs-ha.yaml @@ -0,0 +1,27 @@ +global_params: + ha_enabled: true + +deploy_options: + sdn_controller: opendaylight + odl_version: boron + sdn_l3: true + tacker: true + congress: true + sfc: false + vpn: false + dataplane: ovs_dpdk + performance: + Controller: + kernel: + hugepagesz: 2M + hugepages: 1024 + Compute: + kernel: + hugepagesz: 2M + hugepages: 2048 + intel_iommu: 'on' + iommu: pt + ovs: + socket_memory: 1024 + pmd_cores: 2 + dpdk_cores: 1 diff --git a/config/deploy/os-odl_l3-ovs-noha.yaml b/config/deploy/os-odl_l3-ovs-noha.yaml new file mode 100644 index 00000000..6f7630dc --- /dev/null +++ b/config/deploy/os-odl_l3-ovs-noha.yaml @@ -0,0 +1,27 @@ +global_params: + ha_enabled: false + +deploy_options: + sdn_controller: opendaylight + odl_version: boron + sdn_l3: true + tacker: true + congress: true + sfc: false + vpn: false + dataplane: ovs_dpdk + performance: + Controller: + kernel: + hugepagesz: 2M + hugepages: 1024 + Compute: + kernel: + hugepagesz: 2M + hugepages: 2048 + intel_iommu: 'on' + iommu: pt + ovs: + socket_memory: 1024 + pmd_cores: 2 + dpdk_cores: 1 diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml index be0b6836..ba784391 100644 --- a/config/network/network_settings.yaml +++ b/config/network/network_settings.yaml @@ -84,7 +84,7 @@ networks: # Network configurations controller: # Mapping for controller profile (nodes that will be used as Controller nodes) phys_type: interface members: - - nic1 + - eth0 # tenant: # Tenant network configuration enabled: true @@ -97,6 +97,7 @@ networks: # Network configurations nic_mapping: # Mapping of network configuration for Overcloud Nodes compute: # Mapping for compute profile (nodes that will be used as Compute nodes) phys_type: interface # Physical interface type (interface or bond) + uio_driver: uio_pci_generic # UIO driver to use for DPDK scenarios. The value is ignored for non-DPDK scenarios. vlan: native # VLAN tag to use with this NIC members: # Physical NIC members of this mapping (Single value allowed for interface phys_type) - eth1 # Note, for Apex you may also use the logical nic name (found by nic order), such as "nic1" @@ -104,7 +105,7 @@ networks: # Network configurations phys_type: interface vlan: native members: - - nic2 # Note, for Apex you may also use the logical nic name (found by nic order), such as "nic1" + - eth1 # Note, for Apex you may also use the logical nic name (found by nic order), such as "nic1" # external: # Can contain 1 or more external networks - public: # "public" network will be the network the installer VM attaches to @@ -135,7 +136,7 @@ networks: # Network configurations phys_type: interface vlan: native members: - - nic3 + - eth2 external_overlay: # External network to be created in OpenStack by Services tenant name: Public_internet type: flat @@ -168,7 +169,7 @@ networks: # Network configurations phys_type: interface vlan: 101 members: - - nic3 + - eth2 external_overlay: # External network to be created in OpenStack by Services tenant name: private_cloud type: vlan @@ -189,7 +190,7 @@ networks: # Network configurations phys_type: interface vlan: native members: - - nic4 + - eth3 # api: # API network configuration enabled: false @@ -201,12 +202,12 @@ networks: # Network configurations phys_type: interface # Physical interface type (interface or bond) vlan: native # VLAN tag to use with this NIC members: # Physical NIC members of this mapping (Single value allowed for interface phys_type) - - nic5 # Note, for Apex you may also use the logical nic name (found by nic order), such as "nic1" + - eth4 # Note, for Apex you may also use the logical nic name (found by nic order), such as "nic1" controller: # Mapping for controller profile (nodes that will be used as Controller nodes) phys_type: interface vlan: native members: - - nic5 + - eth4 # Apex specific settings apex: -- cgit 1.2.3-korg