Merge "Removing the deprecated environment files for hw offloading in queens" into stable/queens
This commit is contained in:
Zuul
Gerrit Code Review
commit
1e653caae2
|
|
@ -1,40 +0,0 @@
|
|||
# A Heat environment file which can be used to enable OVN
|
||||
# extensions, configured via puppet
|
||||
resource_registry:
|
||||
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN
|
||||
OS::TripleO::Services::OVNController: ../puppet/services/ovn-controller.yaml
|
||||
OS::TripleO::Services::OVNDBs: ../puppet/services/ovn-dbs.yaml
|
||||
OS::TripleO::Services::NeutronSriovHostConfig: ../puppet/services/neutron-sriov-host-config.yaml
|
||||
# Disabling Neutron services that overlap with OVN
|
||||
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
|
||||
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
|
||||
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
|
||||
|
||||
parameter_defaults:
|
||||
NeutronMechanismDrivers: ovn
|
||||
OVNVifType: ovs
|
||||
OVNNeutronSyncMode: log
|
||||
OVNQosDriver: ovn-qos
|
||||
OVNTunnelEncapType: geneve
|
||||
NeutronEnableDHCPAgent: false
|
||||
NeutronTypeDrivers: 'geneve,vlan,flat'
|
||||
NeutronNetworkType: 'geneve'
|
||||
NeutronServicePlugins: 'qos,ovn-router,trunk'
|
||||
NeutronVniRanges: ['1:65536', ]
|
||||
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
|
||||
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||
|
||||
ComputeSriovParameters:
|
||||
KernelArgs: "intel_iommu=on iommu=pt"
|
||||
OvsHwOffload: True
|
||||
# Number of VFs that needs to be configured for a physical interface
|
||||
#NeutronSriovNumVFs: ["enp2s0f0:4:switchdev"]
|
||||
# Mapping of SR-IOV PF interface to neutron physical_network.
|
||||
# In case of GENEVE physical_network should be null.
|
||||
# In case of flat/vlan the physical_network should as configured in neutron.
|
||||
#NovaPCIPassthrough:
|
||||
# - devname: "enp2s0f0"
|
||||
# physical_network: "datacentre"
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
# A Heat environment that can be used to deploy OpenDaylight with SRIOV
|
||||
resource_registry:
|
||||
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
|
||||
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
|
||||
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronCorePlugin: ../puppet/services/neutron-plugin-ml2-odl.yaml
|
||||
OS::TripleO::Services::OpenDaylightApi: ../puppet/services/opendaylight-api.yaml
|
||||
OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml
|
||||
OS::TripleO::Services::NeutronSriovHostConfig: ../puppet/services/neutron-sriov-host-config.yaml
|
||||
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
|
||||
|
||||
parameter_defaults:
|
||||
NeutronEnableForceMetadata: true
|
||||
NeutronPluginExtensions: 'port_security'
|
||||
NeutronMechanismDrivers: ['opendaylight_v2']
|
||||
NeutronServicePlugins: 'odl-router_v2,trunk'
|
||||
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
|
||||
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||
|
||||
# Kernel arguments for ComputeSriov node
|
||||
ComputeSriovParameters:
|
||||
KernelArgs: "intel_iommu=on iommu=pt"
|
||||
OvsHwOffload: True
|
||||
# Number of VFs that needs to be configured for a physical interface
|
||||
#NeutronSriovNumVFs: ["ens3f0:4:switchdev"]
|
||||
# Mapping of SR-IOV PF interface to neutron physical_network.
|
||||
# In case of Vxlan/GRE physical_network should be null.
|
||||
# In case of flat/vlan the physical_network should as configured in neutron.
|
||||
#NovaPCIPassthrough:
|
||||
# - devname: "ens3f0"
|
||||
# physical_network: null
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
# A Heat environment that can be used to deploy OpenDaylight with SRIOV
|
||||
resource_registry:
|
||||
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
|
||||
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
|
||||
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronCorePlugin: ../../puppet/services/neutron-plugin-ml2-odl.yaml
|
||||
OS::TripleO::Services::OpenDaylightApi: ../../docker/services/opendaylight-api.yaml
|
||||
OS::TripleO::Services::OpenDaylightOvs: ../../puppet/services/opendaylight-ovs.yaml
|
||||
OS::TripleO::Services::NeutronSriovHostConfig: ../../puppet/services/neutron-sriov-host-config.yaml
|
||||
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
|
||||
|
||||
parameter_defaults:
|
||||
NeutronEnableForceMetadata: true
|
||||
NeutronPluginExtensions: 'port_security'
|
||||
NeutronMechanismDrivers: ['opendaylight_v2']
|
||||
NeutronServicePlugins: 'odl-router_v2,trunk'
|
||||
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
|
||||
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||
|
||||
# Kernel arguments for ComputeSriov node
|
||||
ComputeSriovParameters:
|
||||
KernelArgs: "intel_iommu=on iommu=pt"
|
||||
OvsHwOffload: True
|
||||
# Number of VFs that needs to be configured for a physical interface
|
||||
#NeutronSriovNumVFs: ["ens3f0:4:switchdev"]
|
||||
# Mapping of SR-IOV PF interface to neutron physical_network.
|
||||
# In case of Vxlan/GRE physical_network should be null.
|
||||
# In case of flat/vlan the physical_network should as configured in neutron.
|
||||
#NovaPCIPassthrough:
|
||||
# - devname: "ens3f0"
|
||||
# physical_network: null
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
|
||||
resource_registry:
|
||||
OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-ovn.yaml
|
||||
OS::TripleO::Services::OVNController: ../../docker/services/ovn-controller.yaml
|
||||
OS::TripleO::Services::OVNDBs: ../../docker/services/ovn-dbs.yaml
|
||||
OS::TripleO::Services::OVNMetadataAgent: ../../docker/services/ovn-metadata.yaml
|
||||
OS::TripleO::Services::NeutronSriovHostConfig: ../../puppet/services/neutron-sriov-host-config.yaml
|
||||
# Disabling Neutron services that overlap with OVN
|
||||
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
|
||||
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
|
||||
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
|
||||
|
||||
|
||||
parameter_defaults:
|
||||
NeutronMechanismDrivers: ovn
|
||||
OVNVifType: ovs
|
||||
OVNNeutronSyncMode: log
|
||||
OVNQosDriver: ovn-qos
|
||||
OVNTunnelEncapType: geneve
|
||||
NeutronEnableDHCPAgent: false
|
||||
NeutronTypeDrivers: 'geneve,vlan,flat'
|
||||
NeutronNetworkType: 'geneve'
|
||||
NeutronServicePlugins: 'qos,ovn-router,trunk'
|
||||
NeutronVniRanges: ['1:65536', ]
|
||||
NeutronPluginExtensions: "qos,port_security,dns"
|
||||
ComputeParameters:
|
||||
NeutronBridgeMappings: ""
|
||||
ControllerParameters:
|
||||
OVNCMSOptions: "enable-chassis-as-gw"
|
||||
|
||||
ComputeSriovParameters:
|
||||
KernelArgs: "intel_iommu=on iommu=pt"
|
||||
OvsHwOffload: True
|
||||
# Number of VFs that needs to be configured for a physical interface
|
||||
#NeutronSriovNumVFs: ["enp2s0f0:4:switchdev"]
|
||||
# Mapping of SR-IOV PF interface to neutron physical_network.
|
||||
# In case of GENEVE physical_network should be null.
|
||||
# In case of flat/vlan the physical_network should as configured in neutron.
|
||||
#NovaPCIPassthrough:
|
||||
# - devname: "enp2s0f0"
|
||||
# physical_network: "datacentre"
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
# A Heat environment file that enables OVS Hardware Offload in the overcloud.
|
||||
# This works by configuring SR-IOV NIC with switchdev and OVS Hardware Offload on
|
||||
# compute nodes. The feature supported in OVS 2.8.0
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::Services::NeutronSriovHostConfig: ../../puppet/services/neutron-sriov-host-config.yaml
|
||||
|
||||
parameter_defaults:
|
||||
|
||||
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
|
||||
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||
|
||||
# Kernel arguments for ComputeSriov node
|
||||
ComputeSriovParameters:
|
||||
KernelArgs: "intel_iommu=on iommu=pt"
|
||||
OvsHwOffload: True
|
||||
# Number of VFs that needs to be configured for a physical interface
|
||||
#NeutronSriovNumVFs: ["ens3f0:4:switchdev"]
|
||||
# Mapping of SR-IOV PF interface to neutron physical_network.
|
||||
# In case of Vxlan/GRE physical_network should be null.
|
||||
# In case of flat/vlan the physical_network should as configured in neutron.
|
||||
#NovaPCIPassthrough:
|
||||
# - devname: "ens3f0"
|
||||
# physical_network: null
|
||||
Loading…
Reference in New Issue