summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 21:57:23 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 21:57:23 +0000
commit36fbc332be360d041ca3c2cc855e86e487d73cca (patch)
treeb14d08f5e122bb0204aba3cc19a1f1c4208328d2
parentfa0976346167b4be6059741c9fedd1cf6a5160c3 (diff)
parentc5b6c12ec91f70366e4d39b46261bc7a20fc426f (diff)
Merge "test_dhcp: Use a safer host name" into stable/newton
-rw-r--r--neutron/tests/functional/agent/linux/test_dhcp.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/neutron/tests/functional/agent/linux/test_dhcp.py b/neutron/tests/functional/agent/linux/test_dhcp.py
index 7876fee..55424a7 100644
--- a/neutron/tests/functional/agent/linux/test_dhcp.py
+++ b/neutron/tests/functional/agent/linux/test_dhcp.py
@@ -38,7 +38,7 @@ class TestDhcp(functional_base.BaseSudoTestCase):
38 conf.register_opts(common_conf.core_opts) 38 conf.register_opts(common_conf.core_opts)
39 conf.register_opts(dhcp_conf.DHCP_AGENT_OPTS) 39 conf.register_opts(dhcp_conf.DHCP_AGENT_OPTS)
40 conf.set_override('interface_driver', 'openvswitch') 40 conf.set_override('interface_driver', 'openvswitch')
41 conf.set_override('host', 'foo_host') 41 conf.set_override('host', 'foo-host')
42 self.conf = conf 42 self.conf = conf
43 br_int = self.useFixture(net_helpers.OVSBridgeFixture()).bridge 43 br_int = self.useFixture(net_helpers.OVSBridgeFixture()).bridge
44 self.conf.set_override('ovs_integration_bridge', br_int.br_name) 44 self.conf.set_override('ovs_integration_bridge', br_int.br_name)