Change default value for NeutronPluginExtensions

After we switch default neutron driver to ovn also
NeutronPluginExtensions should contain dns because
"qos,port_security,dns" is default value for ovn.

Change-Id: I201628e27ec5bbe9e58e469f50d8a58d34b117aa
(cherry picked from commit 76f683f79c)
This commit is contained in:
Kamil Sambor 2019-12-10 11:32:17 +01:00
parent 63cf1906fe
commit f763f2e504
12 changed files with 16 additions and 1 deletions

View File

@ -78,6 +78,7 @@ parameter_defaults:
nova::compute::libvirt::libvirt_cpu_mode: 'none' nova::compute::libvirt::libvirt_cpu_mode: 'none'
# For ML2/OVS # For ML2/OVS
NeutronMechanismDrivers: 'openvswitch' NeutronMechanismDrivers: 'openvswitch'
NeutronPluginExtensions: "qos,port_security"
NeutronTypeDrivers: 'vxlan,vlan,flat,gre' NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
NeutronNetworkType: 'vxlan' NeutronNetworkType: 'vxlan'
NeutronServicePlugins: 'router,qos,segments,trunk' NeutronServicePlugins: 'router,qos,segments,trunk'

View File

@ -30,6 +30,7 @@ parameter_defaults:
NeutronMechanismDrivers: ['openvswitch'] NeutronMechanismDrivers: ['openvswitch']
NeutronTypeDrivers: 'vxlan,vlan,flat,gre' NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
NeutronNetworkType: 'vxlan' NeutronNetworkType: 'vxlan'
NeutronPluginExtensions: "qos,port_security"
NeutronServicePlugins: 'router,qos,segments,trunk' NeutronServicePlugins: 'router,qos,segments,trunk'
NeutronVniRanges: ['1:4094', ] NeutronVniRanges: ['1:4094', ]
NeutronEnableDVR: false NeutronEnableDVR: false

View File

@ -45,7 +45,7 @@ parameters:
default: 'datacentre' default: 'datacentre'
description: If set, flat networks to configure in neutron plugins. description: If set, flat networks to configure in neutron plugins.
NeutronPluginExtensions: NeutronPluginExtensions:
default: "qos,port_security" default: "qos,port_security,dns"
description: | description: |
Comma-separated list of extensions enabled for the Neutron plugin. Comma-separated list of extensions enabled for the Neutron plugin.
type: comma_delimited_list type: comma_delimited_list

View File

@ -32,6 +32,7 @@ parameter_defaults:
################### ###################
NeutronCorePlugin: 'neutron.plugins.ml2.plugin.Ml2Plugin' NeutronCorePlugin: 'neutron.plugins.ml2.plugin.Ml2Plugin'
NeutronPluginExtensions: "qos,port_security"
NeutronMechanismDrivers: 'sriovnicswitch,cisco_vts' NeutronMechanismDrivers: 'sriovnicswitch,cisco_vts'
NeutronTypeDrivers: 'vxlan,vlan,flat' NeutronTypeDrivers: 'vxlan,vlan,flat'
NeutronServicePlugins: 'cisco_vts_router,trunk' NeutronServicePlugins: 'cisco_vts_router,trunk'

View File

@ -5,5 +5,6 @@ resource_registry:
parameter_defaults: parameter_defaults:
NeutronMechanismDrivers: ['sriovnicswitch','openvswitch'] NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']
NeutronPluginExtensions: "qos,port_security"
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter'] NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"] NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]

View File

@ -35,3 +35,4 @@ parameter_defaults:
NeutronMechanismDrivers: 'sriovnicswitch,cisco_vts' NeutronMechanismDrivers: 'sriovnicswitch,cisco_vts'
NeutronTypeDrivers: 'vxlan,vlan,flat' NeutronTypeDrivers: 'vxlan,vlan,flat'
NeutronServicePlugins: 'cisco_vts_router,trunk' NeutronServicePlugins: 'cisco_vts_router,trunk'
NeutronPluginExtensions: "qos,port_security"

View File

@ -6,6 +6,7 @@ resource_registry:
parameter_defaults: parameter_defaults:
NeutronMechanismDrivers: ['mlnx_sdn_assist','mlnx_infiniband'] NeutronMechanismDrivers: ['mlnx_sdn_assist','mlnx_infiniband']
NeutronPluginExtensions: "qos,port_security"
NeutronPhysicalDevMappings: ['datacentre:ib0'] NeutronPhysicalDevMappings: ['datacentre:ib0']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter', 'NUMATopologyFilter'] NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter', 'NUMATopologyFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"] NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]

View File

@ -8,4 +8,5 @@ parameter_defaults:
NeutronVhostuserSocketDir: "/var/lib/vhost_sockets" NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter" NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
OvsDpdkDriverType: "vfio-pci" OvsDpdkDriverType: "vfio-pci"
NeutronPluginExtensions: "qos,port_security"

View File

@ -28,6 +28,7 @@ parameter_defaults:
NeutronMechanismDrivers: ['openvswitch', 'l2population'] NeutronMechanismDrivers: ['openvswitch', 'l2population']
NeutronEnableL2Pop: 'True' NeutronEnableL2Pop: 'True'
NeutronPluginExtensions: "qos,port_security"
NeutronTypeDrivers: 'vxlan,vlan,flat,gre' NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
NeutronNetworkType: 'vxlan' NeutronNetworkType: 'vxlan'
NeutronServicePlugins: 'router,qos,segments,trunk' NeutronServicePlugins: 'router,qos,segments,trunk'

View File

@ -25,6 +25,7 @@ resource_registry:
parameter_defaults: parameter_defaults:
NeutronMechanismDrivers: ['openvswitch'] NeutronMechanismDrivers: ['openvswitch']
NeutronPluginExtensions: "qos,port_security"
NeutronTypeDrivers: 'vxlan,vlan,flat,gre' NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
NeutronNetworkType: 'vxlan' NeutronNetworkType: 'vxlan'

View File

@ -5,5 +5,6 @@ resource_registry:
parameter_defaults: parameter_defaults:
NeutronMechanismDrivers: ['sriovnicswitch','openvswitch'] NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']
NeutronPluginExtensions: "qos,port_security"
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter'] NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"] NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]

View File

@ -0,0 +1,5 @@
---
fixes:
- |
After we switch default neutron driver to ovn also NeutronPluginExtensions
should contain dns because "qos,port_security,dns" is default value for ovn