Merge "NSXV: retrieve DNS IPs from subnet correctly" into stable/victoria
This commit is contained in:
commit
555d02fd0a
|
@ -1031,8 +1031,7 @@ class EdgeManager(object):
|
||||||
# Set gateway for static binding
|
# Set gateway for static binding
|
||||||
static_config['defaultGateway'] = subnet['gateway_ip']
|
static_config['defaultGateway'] = subnet['gateway_ip']
|
||||||
# set primary and secondary dns
|
# set primary and secondary dns
|
||||||
name_servers = [dns['address']
|
name_servers = subnet['dns_nameservers']
|
||||||
for dns in subnet['dns_nameservers']]
|
|
||||||
# if no nameservers have been configured then use the ones
|
# if no nameservers have been configured then use the ones
|
||||||
# defined in the configuration
|
# defined in the configuration
|
||||||
name_servers = name_servers or cfg.CONF.nsxv.nameservers
|
name_servers = name_servers or cfg.CONF.nsxv.nameservers
|
||||||
|
|
Loading…
Reference in New Issue