From 42def5b1f95a2b459817329a5c7b5035548ac37d Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Mon, 14 Jan 2019 15:07:23 -0500
Subject: [PATCH] Stein: Update neutron overrides

Update neutron chart overrides to align with the upstream docker image
based on the master branch.

Changes include:
 - Remove StarlingX use of custom extensions for the host driver and
   scheduler.
 - Update the ml2 type_drivers to the expected upstream values.
 - As of Queens the deprecated api-paste entrypoint
   neutron.api.versions:Versions.factory has been removed. An override
   has been provided to use neutron.pecan_wsgi.app:versions_factory.

Change-Id: I9a40f31d0795acd24a2ccef22f2b4c9630a8b924
Signed-off-by: Robert Church <robert.church@windriver.com>
Story: 2004751
Task: 28895
---
 sysinv/sysinv/sysinv/sysinv/helm/neutron.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sysinv/sysinv/sysinv/sysinv/helm/neutron.py b/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
index b7c353d5e3..3450fe7231 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
@@ -89,7 +89,13 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
                         'neutron_sriov-agent': {
                             'hosts': self._get_per_host_overrides()
                         },
-                    }
+                    },
+                    'paste': {
+                        'app:neutronversions': {
+                            'paste.app_factory':
+                                'neutron.pecan_wsgi.app:versions_factory'
+                        },
+                    },
                 },
                 'labels': self._get_labels_overrides(),
                 'endpoints': self._get_endpoints_overrides(),
@@ -260,14 +266,8 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
                 'router_status_managed': True,
                 'vlan_transparent': True,
                 'wsgi_default_pool_size': 100,
-                'router_scheduler_driver':
-                    'neutron.scheduler.l3_host_agent_scheduler.HostBasedScheduler',
-                'network_scheduler_driver':
-                    'neutron.scheduler.dhcp_host_agent_scheduler.HostBasedScheduler',
                 'notify_nova_on_port_data_changes': True,
                 'notify_nova_on_port_status_changes': True,
-                'host_driver':
-                    'neutron.plugins.wrs.drivers.host.DefaultHostDriver',
                 'control_exchange': 'neutron',
                 'core_plugin': 'neutron.plugins.ml2.plugin.Ml2Plugin',
                 'state_path': '/var/run/neutron',
@@ -295,7 +295,7 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
     def _get_neutron_ml2_config(self):
         ml2_config = {
             'ml2': {
-                'type_drivers': 'managed_flat,managed_vlan,managed_vxlan',
+                'type_drivers': 'flat,vlan,vxlan',
                 'tenant_network_types': 'vlan,vxlan',
                 'mechanism_drivers': 'openvswitch,sriovnicswitch,l2population',
                 'path_mtu': 0,