summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 04:01:29 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 04:01:29 +0000
commitb0f3e54c9b0fe21b8f0015a6ed490b214407b0a1 (patch)
treec9f756efc6b46f9bdb25292b07b3730a5048cd2f
parent435e9068bf51afb97d2b374073c89d7c61f262df (diff)
parent258dc0281bef87d14ab4976eaf99269c58939a64 (diff)
Merge "test_dhcp: Use a safer host name" into stable/ocata
-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)