Merge "Remove deprecated NFV environment files"
This commit is contained in:
Zuul
Gerrit Code Review
commit
a276f65ae3
@ -1,43 +0,0 @@
|
||||
# *************************************************************************************
|
||||
# DEPRECATED: Use tripleo-heat-templates/environments/services/neutron-ovs-dpdk.yaml
|
||||
# instead. Both files has the same configurations.
|
||||
# *************************************************************************************
|
||||
# A Heat environment that can be used to deploy DPDK with OVS
|
||||
# Deploying DPDK requires enabling hugepages for the overcloud nodes
|
||||
resource_registry:
|
||||
OS::TripleO::Services::ComputeNeutronOvsDpdk: ../deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml
|
||||
|
||||
parameter_defaults:
|
||||
NeutronDatapathType: "netdev"
|
||||
NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
|
||||
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
|
||||
OvsDpdkDriverType: "vfio-pci"
|
||||
|
||||
#ComputeOvsDpdkParameters:
|
||||
## Host configuration Parameters
|
||||
#TunedProfileName: "cpu-partitioning"
|
||||
#IsolCpusList: "" # Logical CPUs list to be isolated from the host process (applied via cpu-partitioning tuned).
|
||||
# It is mandatory to provide isolated cpus for tuned to achive optimal performance.
|
||||
# Example: "3-8,12-15,18"
|
||||
#KernelArgs: "" # Space separated kernel args to configure hugepage and IOMMU.
|
||||
# Deploying DPDK requires enabling hugepages for the overcloud compute nodes.
|
||||
# It also requires enabling IOMMU when using the VFIO (vfio-pci) OvsDpdkDriverType.
|
||||
# This should be done by configuring parameters via host-config-and-reboot.yaml environment file.
|
||||
|
||||
## Attempting to deploy DPDK without appropriate values for the below parameters may lead to unstable deployments
|
||||
## due to CPU contention of DPDK PMD threads.
|
||||
## It is highly recommended to to enable isolcpus (via KernelArgs) on compute overcloud nodes and set the following parameters:
|
||||
#OvsDpdkSocketMemory: "" # Sets the amount of hugepage memory to assign per NUMA node.
|
||||
# It is recommended to use the socket closest to the PCIe slot used for the
|
||||
# desired DPDK NIC. Format should be comma separated per socket string such as:
|
||||
# "<socket 0 mem MB>,<socket 1 mem MB>", for example: "1024,0".
|
||||
#OvsPmdCoreList: "" # List or range of CPU cores for PMD threads to be pinned to. Note, NIC
|
||||
# location to cores on socket, number of hyper-threaded logical cores, and
|
||||
# desired number of PMD threads can all play a role in configuring this setting.
|
||||
# These cores should be on the same socket where OvsDpdkSocketMemory is assigned.
|
||||
# If using hyperthreading then specify both logical cores that would equal the
|
||||
# physical core. Also, specifying more than one core will trigger multiple PMD
|
||||
# threads to be spawned, which may improve dataplane performance.
|
||||
#NovaVcpuPinSet: "" # Cores to pin Nova instances to. For maximum performance, select cores
|
||||
# on the same NUMA node(s) selected for previous settings.
|
||||
#NumDpdkInterfaceRxQueues: 1
|
||||
@ -1,13 +0,0 @@
|
||||
# *************************************************************************************
|
||||
# DEPRECATED: Use tripleo-heat-templates/environments/services/neutron-sriov.yaml
|
||||
# instead. Both files has the same configurations.
|
||||
# *************************************************************************************
|
||||
## A Heat environment that can be used to deploy SR-IOV
|
||||
resource_registry:
|
||||
OS::TripleO::Services::NeutronSriovAgent: ../deployment/neutron/neutron-sriov-agent-container-puppet.yaml
|
||||
OS::TripleO::Services::NeutronSriovHostConfig: ../deployment/neutron/neutron-sriov-host-config.yaml
|
||||
|
||||
parameter_defaults:
|
||||
NeutronMechanismDrivers: ['sriovnicswitch', 'openvswitch']
|
||||
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
|
||||
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||
@ -1,20 +0,0 @@
|
||||
# DEPRECATED, this parameter is added as part of the roles/ComputeOvsDpdk.yaml
|
||||
# to include it by default for all OvS-DPDK roles. This environment file is
|
||||
# obsolete and will be removed in S release.
|
||||
#
|
||||
# This permission changes should be applied only on the fresh deployment of
|
||||
# queens, minor updates in queens (and future) and then upgrades from queens
|
||||
# to future versions.
|
||||
#
|
||||
# It should NOT be used for upgrade from pike, ocata, newton as the existing
|
||||
# vhost ports and ovs will be with root permissions. Modifying the ovs to run
|
||||
# with new user during upgrades will result in errors as the existing files and
|
||||
# folders need to be updated with new permissions. If this is required during
|
||||
# the upgrade, it is preferrable to do it externally after upgrade. Once the
|
||||
# changes has been applied, this environment file can be used for further
|
||||
# updates and upgrades.
|
||||
|
||||
parameter_defaults:
|
||||
ComputeOvsDpdkParameters:
|
||||
VhostuserSocketGroup: "hugetlbfs"
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
# A Heat environment that can be used to deploy OpenDaylight with L3 DVR and DPDK.
|
||||
# This file is to be used with neutron-opendaylight.yaml
|
||||
|
||||
parameter_defaults:
|
||||
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
|
||||
OpenDaylightSNATMechanism: 'controller'
|
||||
|
||||
ComputeOvsDpdkParameters:
|
||||
OvsEnableDpdk: True
|
||||
|
||||
## Host configuration Parameters
|
||||
#TunedProfileName: "cpu-partitioning"
|
||||
#IsolCpusList: "" # Logical CPUs list to be isolated from the host process (applied via cpu-partitioning tuned).
|
||||
# It is mandatory to provide isolated cpus for tuned to achive optimal performance.
|
||||
# Example: "3-8,12-15,18"
|
||||
#KernelArgs: "" # Space separated kernel args to configure hugepage and IOMMU.
|
||||
# Deploying DPDK requires enabling hugepages for the overcloud compute nodes.
|
||||
# It also requires enabling IOMMU when using the VFIO (vfio-pci) OvsDpdkDriverType.
|
||||
# This should be done by configuring parameters via host-config-and-reboot.yaml environment file.
|
||||
|
||||
## Attempting to deploy DPDK without appropriate values for the below parameters may lead to unstable deployments
|
||||
## due to CPU contention of DPDK PMD threads.
|
||||
## It is highly recommended to to enable isolcpus (via KernelArgs) on compute overcloud nodes and set the following parameters:
|
||||
#OvsDpdkSocketMemory: "" # Sets the amount of hugepage memory to assign per NUMA node.
|
||||
# It is recommended to use the socket closest to the PCIe slot used for the
|
||||
# desired DPDK NIC. Format should be comma separated per socket string such as:
|
||||
# "<socket 0 mem MB>,<socket 1 mem MB>", for example: "1024,0".
|
||||
#OvsDpdkDriverType: "vfio-pci" # Ensure the Overcloud NIC to be used for DPDK supports this UIO/PMD driver.
|
||||
#OvsPmdCoreList: "" # List or range of CPU cores for PMD threads to be pinned to. Note, NIC
|
||||
# location to cores on socket, number of hyper-threaded logical cores, and
|
||||
# desired number of PMD threads can all play a role in configuring this setting.
|
||||
# These cores should be on the same socket where OvsDpdkSocketMemory is assigned.
|
||||
# If using hyperthreading then specify both logical cores that would equal the
|
||||
# physical core. Also, specifying more than one core will trigger multiple PMD
|
||||
# threads to be spawned, which may improve dataplane performance.
|
||||
#NovaVcpuPinSet: "" # Cores to pin Nova instances to. For maximum performance, select cores
|
||||
# on the same NUMA node(s) selected for previous settings.
|
||||
@ -1,11 +0,0 @@
|
||||
# A Heat environment that can be used to deploy DPDK with OVS
|
||||
# Deploying DPDK requires enabling hugepages for the overcloud nodes
|
||||
resource_registry:
|
||||
OS::TripleO::Services::ComputeNeutronOvsDpdk: ../../deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml
|
||||
|
||||
parameter_defaults:
|
||||
NeutronDatapathType: "netdev"
|
||||
NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
|
||||
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
|
||||
OvsDpdkDriverType: "vfio-pci"
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
---
|
||||
deprecations:
|
||||
- |
|
||||
Deprecated environment files are removed. Removed
|
||||
``environments/neutron-sriov.yaml``, use
|
||||
``environments/services/neutron-sriov.yaml`` file. Removed
|
||||
``environments/neutron-ovs-dpdk.yaml``, use
|
||||
``environments/services/neutron-ovs-dpdk.yaml`` file. Removed
|
||||
``environments/ovs-dpdk-permissions.yaml``, as the
|
||||
required parameter is added to the OvS-DPDK roles.
|
||||
Loading…
Reference in New Issue
Block a user