update vhost-user enabled helm parameter

The vhost_user_enabled neutron config parameter has been moved under the
ML2 ovs_driver section in the last stein/master docker build, therefore
this helm override parameter needs to be updated to the new location.

Depends-on: https://review.openstack.org/#/c/635551/
Depends-on: https://review.openstack.org/#/c/635552/
Story: 2004751
Task:29364

Change-Id: I2181926fdbea2e00b152a65bf76f9c9f1c85247c
Signed-off-by: Matt Peters <matt.peters@windriver.com>
This commit is contained in:
Matt Peters 2019-02-05 15:54:18 -05:00
parent bc22ce210b
commit 67f351d6f9
1 changed files with 4 additions and 4 deletions

View File

@ -128,7 +128,7 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
def update_dynamic_options(self, overrides):
if utils.is_virtual():
overrides['neutron']['vhost']['vhost_user_enabled'] = False
overrides['plugins']['ml2_conf']['ovs_driver']['vhost_user_enabled'] = False
def update_from_service_parameters(self, overrides):
service_parameters = self._get_service_parameters(service=constants.SERVICE_TYPE_NETWORK)
@ -294,9 +294,6 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
'allow_automatic_dhcp_failover': True,
'allow_automatic_l3agent_failover': True,
},
'vhost': {
'vhost_user_enabled': True,
},
'agent': {
'root_helper': 'sudo',
},
@ -323,6 +320,9 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
'physical_network_mtus': self._get_ml2_physical_network_mtus()
},
'ovs_driver': {
'vhost_user_enabled': True,
},
'securitygroup': {
'firewall_driver': 'noop',
},