openstack
/
neutron
Code Issues Proposed changes

Merge "Do not use privsep context when listing the namespaces in fullstack"

This commit is contained in:
Zuul 2019-07-23 17:53:32 +00:00 committed by Gerrit Code Review
parent 261be89fc6 9c5f394b73
commit 6d9283c1bc
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
neutron/tests/fullstack/resources/config.py
View File

@ -207,7 +207,8 @@ class OVSConfigFixture(ConfigFixture):
'agent': { 'agent': {
'l2_population': str(self.env_desc.l2_pop), 'l2_population': str(self.env_desc.l2_pop),
'arp_responder': str(self.env_desc.arp_responder), 'arp_responder': str(self.env_desc.arp_responder),
'debug_iptables_rules': str(env_desc.debug_iptables) 'debug_iptables_rules': str(env_desc.debug_iptables),
'use_helper_for_ns_read': 'False',
} }
}) })
@ -335,7 +336,8 @@ class LinuxBridgeConfigFixture(ConfigFixture):
'firewall_driver': host_desc.firewall_driver, 'firewall_driver': host_desc.firewall_driver,
}, },
'AGENT': { 'AGENT': {
'debug_iptables_rules': str(env_desc.debug_iptables) 'debug_iptables_rules': str(env_desc.debug_iptables),
'use_helper_for_ns_read': 'False',
} }
}) })
if env_desc.qos: if env_desc.qos:
@ -382,6 +384,9 @@ class L3ConfigFixture(ConfigFixture):
'debug': 'True', 'debug': 'True',
'test_namespace_suffix': self._generate_namespace_suffix(), 'test_namespace_suffix': self._generate_namespace_suffix(),
}) })
self.config.update({
'agent': {'use_helper_for_ns_read': 'False'}
})
if host_desc.availability_zone: if host_desc.availability_zone:
self.config['agent'].update({ self.config['agent'].update({
'availability_zone': host_desc.availability_zone 'availability_zone': host_desc.availability_zone
@ -420,8 +425,11 @@ class DhcpConfigFixture(ConfigFixture):
'dhcp_confs': self._generate_dhcp_path(), 'dhcp_confs': self._generate_dhcp_path(),
'test_namespace_suffix': self._generate_namespace_suffix() 'test_namespace_suffix': self._generate_namespace_suffix()
}) })
self.config.update({
'AGENT': {'use_helper_for_ns_read': 'False'}
})
if host_desc.availability_zone: if host_desc.availability_zone:
self.config['agent'].update({ self.config['AGENT'].update({
'availability_zone': host_desc.availability_zone 'availability_zone': host_desc.availability_zone
}) })