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 76f683f)
openstack-archive · Dec 13, 2019 · f763f2e · f763f2e
1 parent 63cf190
commit f763f2e
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 1 deletion.
diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml
@@ -78,6 +78,7 @@ parameter_defaults:
     nova::compute::libvirt::libvirt_cpu_mode: 'none'
   # For ML2/OVS
   NeutronMechanismDrivers: 'openvswitch'
+  NeutronPluginExtensions: "qos,port_security"
   NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
   NeutronNetworkType: 'vxlan'
   NeutronServicePlugins: 'router,qos,segments,trunk'

diff --git a/ci/environments/scenario007-standalone.yaml b/ci/environments/scenario007-standalone.yaml
@@ -30,6 +30,7 @@ parameter_defaults:
   NeutronMechanismDrivers: ['openvswitch']
   NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
   NeutronNetworkType: 'vxlan'
+  NeutronPluginExtensions: "qos,port_security"
   NeutronServicePlugins: 'router,qos,segments,trunk'
   NeutronVniRanges: ['1:4094', ]
   NeutronEnableDVR: false

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

diff --git a/environments/services-baremetal/neutron-ml2-cisco-vts.yaml b/environments/services-baremetal/neutron-ml2-cisco-vts.yaml
@@ -32,6 +32,7 @@ parameter_defaults:
   ###################
 
   NeutronCorePlugin: 'neutron.plugins.ml2.plugin.Ml2Plugin'
+  NeutronPluginExtensions: "qos,port_security"
   NeutronMechanismDrivers: 'sriovnicswitch,cisco_vts'
   NeutronTypeDrivers: 'vxlan,vlan,flat'
   NeutronServicePlugins: 'cisco_vts_router,trunk'
diff --git a/environments/services-baremetal/neutron-sriov.yaml b/environments/services-baremetal/neutron-sriov.yaml
@@ -5,5 +5,6 @@ resource_registry:
 
 parameter_defaults:
   NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']
+  NeutronPluginExtensions: "qos,port_security"
   NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
   NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
diff --git a/environments/services/neutron-ml2-cisco-vts.yaml b/environments/services/neutron-ml2-cisco-vts.yaml
@@ -35,3 +35,4 @@ parameter_defaults:
   NeutronMechanismDrivers: 'sriovnicswitch,cisco_vts'
   NeutronTypeDrivers: 'vxlan,vlan,flat'
   NeutronServicePlugins: 'cisco_vts_router,trunk'
+  NeutronPluginExtensions: "qos,port_security"
diff --git a/environments/services/neutron-mlnx-agent.yaml b/environments/services/neutron-mlnx-agent.yaml
@@ -6,6 +6,7 @@ resource_registry:
 
 parameter_defaults:
   NeutronMechanismDrivers: ['mlnx_sdn_assist','mlnx_infiniband']
+  NeutronPluginExtensions: "qos,port_security"
   NeutronPhysicalDevMappings: ['datacentre:ib0']
   NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter', 'NUMATopologyFilter']
   NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]

diff --git a/environments/services/neutron-ovs-dpdk.yaml b/environments/services/neutron-ovs-dpdk.yaml
@@ -8,4 +8,5 @@ parameter_defaults:
   NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
   NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
   OvsDpdkDriverType: "vfio-pci"
+  NeutronPluginExtensions: "qos,port_security"
 
diff --git a/environments/services/neutron-ovs-dvr.yaml b/environments/services/neutron-ovs-dvr.yaml
@@ -28,6 +28,7 @@ parameter_defaults:
   NeutronMechanismDrivers: ['openvswitch', 'l2population']
   NeutronEnableL2Pop: 'True'
 
+  NeutronPluginExtensions: "qos,port_security"
   NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
   NeutronNetworkType: 'vxlan'
   NeutronServicePlugins: 'router,qos,segments,trunk'

diff --git a/environments/services/neutron-ovs.yaml b/environments/services/neutron-ovs.yaml
@@ -25,6 +25,7 @@ resource_registry:
 parameter_defaults:
 
   NeutronMechanismDrivers: ['openvswitch']
+  NeutronPluginExtensions: "qos,port_security"
 
   NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
   NeutronNetworkType: 'vxlan'

diff --git a/environments/services/neutron-sriov.yaml b/environments/services/neutron-sriov.yaml
@@ -5,5 +5,6 @@ resource_registry:
 
 parameter_defaults:
   NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']
+  NeutronPluginExtensions: "qos,port_security"
   NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
   NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
diff --git a/releasenotes/notes/change_default_NeutronPluginExtensions-b31ed1c44fec4568.yaml b/releasenotes/notes/change_default_NeutronPluginExtensions-b31ed1c44fec4568.yaml
@@ -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