openstack
/
nova
Code Issues Proposed changes

Refactored test in linux_net to pass with random PYTHONHASHSEED 

Previous implementation wraps dns list into set.
With random PYTHONHASHSEED set elements iteration order
wasn't guaranteed.

Partial-Bug: #1348818

Change-Id: Iffdaf7d75ef2131c9d9fc7aa075c95b5569902c2
This commit is contained in:
Timofey Durakov 2015-03-03 13:48:02 +03:00
parent eafa17d0c0
commit 3d7f3d1699
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/network/linux_net.py
View File

@ -1143,12 +1143,12 @@ def restart_dhcp(context, dev, network_ref, fixedips):
if CONF.dhcp_domain:
cmd.append('--domain=%s' % CONF.dhcp_domain)
dns_servers = set(CONF.dns_server)
dns_servers = CONF.dns_server
if CONF.use_network_dns_servers:
if network_ref.get('dns1'):
dns_servers.add(network_ref.get('dns1'))
dns_servers.append(network_ref.get('dns1'))
if network_ref.get('dns2'):
dns_servers.add(network_ref.get('dns2'))
dns_servers.append(network_ref.get('dns2'))
if network_ref['multi_host']:
cmd.append('--addn-hosts=%s' % _dhcp_file(dev, 'hosts'))
if dns_servers: