From f0b393f30952aa226976c33b9ff9241283fab207 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Thu, 17 Jan 2019 07:09:35 -0500 Subject: [PATCH] Kubernetes Neutron VIM Host Management Refactoring Rework neutron system host management to operate on agent states rather than an extended host entity, as it was agreed with the neutron team that a new host level entity was not desired in the neutron core. This commit modifies the neutron override values to accommodate the above. Story: 2003857 Task: 26669 Depends-On: I441fcf3c186f68d17abafe337af71d0caf9c40da Change-Id: I85943d5b6f421f4ef379694f21ad2d758bb5f38a Signed-off-by: Kevin Smith --- sysinv/sysinv/sysinv/sysinv/helm/neutron.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sysinv/sysinv/sysinv/sysinv/helm/neutron.py b/sysinv/sysinv/sysinv/sysinv/helm/neutron.py index b7c353d5e3..b1a81b49e4 100644 --- a/sysinv/sysinv/sysinv/sysinv/helm/neutron.py +++ b/sysinv/sysinv/sysinv/sysinv/helm/neutron.py @@ -260,14 +260,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', @@ -281,6 +275,9 @@ class NeutronHelm(openstack.OpenstackBaseHelm): 'policy_file': '/etc/neutron/policy.json', 'service_plugins': 'router', 'dns_domain': 'openstacklocal', + 'enable_new_agents': False, + 'allow_automatic_dhcp_failover': True, + 'allow_automatic_l3agent_failover': True, }, 'vhost': { 'vhost_user_enabled': True,