Merge "Do not use privsep context when listing the namespaces in fullstack"
This commit is contained in:
commit
6d9283c1bc
@ -207,7 +207,8 @@ class OVSConfigFixture(ConfigFixture):
|
||||
'agent': {
|
||||
'l2_population': str(self.env_desc.l2_pop),
|
||||
'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,
|
||||
},
|
||||
'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:
|
||||
@ -382,6 +384,9 @@ class L3ConfigFixture(ConfigFixture):
|
||||
'debug': 'True',
|
||||
'test_namespace_suffix': self._generate_namespace_suffix(),
|
||||
})
|
||||
self.config.update({
|
||||
'agent': {'use_helper_for_ns_read': 'False'}
|
||||
})
|
||||
if host_desc.availability_zone:
|
||||
self.config['agent'].update({
|
||||
'availability_zone': host_desc.availability_zone
|
||||
@ -420,8 +425,11 @@ class DhcpConfigFixture(ConfigFixture):
|
||||
'dhcp_confs': self._generate_dhcp_path(),
|
||||
'test_namespace_suffix': self._generate_namespace_suffix()
|
||||
})
|
||||
self.config.update({
|
||||
'AGENT': {'use_helper_for_ns_read': 'False'}
|
||||
})
|
||||
if host_desc.availability_zone:
|
||||
self.config['agent'].update({
|
||||
self.config['AGENT'].update({
|
||||
'availability_zone': host_desc.availability_zone
|
||||
})
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user