Merge "Revert "Use 2 dhcp agents in TestLegacyL3Agent""

This commit is contained in:
Zuul 2021-10-16 03:12:26 +00:00 committed by Gerrit Code Review
commit 12ca5e9a40

View File

@ -279,10 +279,7 @@ class TestLegacyL3Agent(TestL3Agent):
environment.HostDescription(l3_agent=True,
dhcp_agent=self.use_dhcp,
l3_agent_extensions="fip_qos"),
# None(obondarev): dhcp agent is added to workaround bug 1930401,
# to be removed in scope of proper bug fix:
# https://review.opendev.org/c/openstack/neutron/+/794994
environment.HostDescription(dhcp_agent=True)]
environment.HostDescription()]
env = environment.Environment(
environment.EnvironmentDescription(
network_type='vlan', l2_pop=False,