saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #25181 from rallytime/bp-25102

Browse source 
Back-port #25102 to 2015.5
This commit is contained in:
Justin Findlay 2015-07-06 18:57:13 -06:00
commit df0bb8c831
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/states/win_network.py
View file

@ -176,6 +176,8 @@ def _changes(cur, dns_proto, dns_servers, ip_proto, ip_addrs, gateway):
)
if cur_dns_proto == 'static':
cur_dns_servers = cur['Statically Configured DNS Servers']
if set(dns_servers or ['None']) != set(cur_dns_servers):
changes['dns_servers'] = dns_servers
elif 'DNS servers configured through DHCP' in cur:
cur_dns_servers = cur['DNS servers configured through DHCP']
cur_ip_proto = 'static' if cur['DHCP enabled'] == 'No' else 'dhcp'
@ -184,8 +186,6 @@ def _changes(cur, dns_proto, dns_servers, ip_proto, ip_addrs, gateway):
if dns_proto != cur_dns_proto:
changes['dns_proto'] = dns_proto
if set(dns_servers or ['None']) != set(cur_dns_servers):
changes['dns_servers'] = dns_servers
if ip_proto != cur_ip_proto:
changes['ip_proto'] = ip_proto
if set(ip_addrs or []) != set(cur_ip_addrs):