Disables QoS with OpenDaylight deployments

QoS is not fully supported and fails to load correctly with
networking-odl.  Therefore disabling it from Neutron extension drivers
until we have it fully working.

Change-Id: I89aa3628c1400305f9659f5c0c99942a7fa7d19e
Closes-Bug: 1708131
(cherry picked from commit cfd0d185a93ac2922e233e268a32c3574bee37bf)

diff --git a/environments/neutron-opendaylight-dpdk.yaml b/environments/neutron-opendaylight-dpdk.yaml
index 236b2fb..0d59898 100644 (file)
--- a/environments/neutron-opendaylight-dpdk.yaml
+++ b/environments/neutron-opendaylight-dpdk.yaml
@@ -9,8 +9,9 @@ resource_registry:
 
 parameter_defaults:
   NeutronEnableForceMetadata: true
+  NeutronPluginExtensions: 'port_security'
   NeutronMechanismDrivers: 'opendaylight_v2'
-  NeutronServicePlugins: 'odl-router_v2'
+  NeutronServicePlugins: 'odl-router_v2,trunk'
   NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
   OpenDaylightSNATMechanism: 'controller'
 

diff --git a/environments/neutron-opendaylight-sriov.yaml b/environments/neutron-opendaylight-sriov.yaml
index 5c0a035..3a212ed 100644 (file)
--- a/environments/neutron-opendaylight-sriov.yaml
+++ b/environments/neutron-opendaylight-sriov.yaml
@@ -11,6 +11,7 @@ resource_registry:
 
 parameter_defaults:
   NeutronEnableForceMetadata: true
+  NeutronPluginExtensions: 'port_security'
   NeutronMechanismDrivers: ['sriovnicswitch','opendaylight_v2']
   NeutronServicePlugins: 'odl-router_v2,trunk'
 

diff --git a/environments/neutron-opendaylight.yaml b/environments/neutron-opendaylight.yaml
index 4644725..e9b1ac1 100644 (file)
--- a/environments/neutron-opendaylight.yaml
+++ b/environments/neutron-opendaylight.yaml
@@ -12,3 +12,4 @@ parameter_defaults:
   NeutronEnableForceMetadata: true
   NeutronMechanismDrivers: 'opendaylight_v2'
   NeutronServicePlugins: 'odl-router_v2,trunk'
+  NeutronPluginExtensions: 'port_security'

diff --git a/environments/services-docker/neutron-opendaylight.yaml b/environments/services-docker/neutron-opendaylight.yaml
index 31d5790..873957a 100644 (file)
--- a/environments/services-docker/neutron-opendaylight.yaml
+++ b/environments/services-docker/neutron-opendaylight.yaml
@@ -10,5 +10,6 @@ resource_registry:
 
 parameter_defaults:
   NeutronEnableForceMetadata: true
+  NeutronPluginExtensions: 'port_security'
   NeutronMechanismDrivers: 'opendaylight_v2'
   NeutronServicePlugins: 'odl-router_v2,trunk'

diff --git a/releasenotes/notes/odl-qos-48b70c804755e3a5.yaml b/releasenotes/notes/odl-qos-48b70c804755e3a5.yaml
new file mode 100644 (file)
index 0000000..380ef7f
--- /dev/null
+++ b/releasenotes/notes/odl-qos-48b70c804755e3a5.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - Disables QoS with OpenDaylight until officially
+    supported.