Browse Source

Merge "Do not use privsep context when listing the namespaces in fullstack" into stable/stein

changes/85/681585/1
Zuul 1 week ago
parent
commit
0750f7f372
1 changed files with 11 additions and 3 deletions
  1. 11
    3
      neutron/tests/fullstack/resources/config.py

+ 11
- 3
neutron/tests/fullstack/resources/config.py View File

@@ -181,7 +181,8 @@ class OVSConfigFixture(ConfigFixture):
181 181
             'agent': {
182 182
                 'l2_population': str(self.env_desc.l2_pop),
183 183
                 'arp_responder': str(self.env_desc.arp_responder),
184
-                'debug_iptables_rules': str(env_desc.debug_iptables)
184
+                'debug_iptables_rules': str(env_desc.debug_iptables),
185
+                'use_helper_for_ns_read': 'False',
185 186
             }
186 187
         })
187 188
 
@@ -292,7 +293,8 @@ class LinuxBridgeConfigFixture(ConfigFixture):
292 293
                 'firewall_driver': host_desc.firewall_driver,
293 294
             },
294 295
             'AGENT': {
295
-                'debug_iptables_rules': str(env_desc.debug_iptables)
296
+                'debug_iptables_rules': str(env_desc.debug_iptables),
297
+                'use_helper_for_ns_read': 'False',
296 298
             }
297 299
         })
298 300
         if env_desc.qos:
@@ -339,6 +341,9 @@ class L3ConfigFixture(ConfigFixture):
339 341
             'debug': 'True',
340 342
             'test_namespace_suffix': self._generate_namespace_suffix(),
341 343
         })
344
+        self.config.update({
345
+            'agent': {'use_helper_for_ns_read': 'False'}
346
+        })
342 347
         if host_desc.availability_zone:
343 348
             self.config['agent'].update({
344 349
                 'availability_zone': host_desc.availability_zone
@@ -377,8 +382,11 @@ class DhcpConfigFixture(ConfigFixture):
377 382
             'dhcp_confs': self._generate_dhcp_path(),
378 383
             'test_namespace_suffix': self._generate_namespace_suffix()
379 384
         })
385
+        self.config.update({
386
+            'AGENT': {'use_helper_for_ns_read': 'False'}
387
+        })
380 388
         if host_desc.availability_zone:
381
-            self.config['agent'].update({
389
+            self.config['AGENT'].update({
382 390
                 'availability_zone': host_desc.availability_zone
383 391
             })
384 392
 

Loading…
Cancel
Save