valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #33724 from silenius/dns

Browse Source 
Dns
This commit is contained in:
Mike Place 2016-06-06 14:53:20 -07:00
commit c3817cff3c
2 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
salt/grains/core.py
View File

@ -12,7 +12,6 @@ as those returned here
# Import python libs
from __future__ import absolute_import
import itertools
import os
import json
import socket
@ -36,6 +35,7 @@ _supported_dists += ('arch', 'mageia', 'meego', 'vmware', 'bluewhite64',
import salt.log
import salt.utils
import salt.utils.network
import salt.utils.dns
# Solve the Chicken and egg problem where grains need to run before any
# of the modules are loaded and are generally available for any usage.
@ -1753,45 +1753,9 @@ def dns():
if salt.utils.is_windows() or 'proxyminion' in __opts__:
return {}
ns4 = []
ns6 = []
search = []
domain = ''
resolv = salt.utils.dns.parse_resolv()
try:
with salt.utils.fopen('/etc/resolv.conf') as f:
for line in f:
line = line.strip().split()
try:
(directive, arg) = (line[0].lower(), line[1:])
if directive == 'nameserver':
ip_addr = arg[0]
if (salt.utils.network.is_ipv4(ip_addr) and
ip_addr not in ns4):
ns4.append(ip_addr)
elif (salt.utils.network.is_ipv6(ip_addr) and
ip_addr not in ns6):
ns6.append(ip_addr)
elif directive == 'domain':
domain = arg[0]
elif directive == 'search':
search = list(itertools.takewhile(
lambda x: x[0] not in ('#', ';'), arg))
except (IndexError, RuntimeError):
continue
ret = {
'nameservers': ns4 + ns6,
'ip4_nameservers': ns4,
'ip6_nameservers': ns6,
'domain': domain,
'search': search
}
return {'dns': ret}
except IOError:
return {}
return {'dns': resolv} if resolv else {}
def get_machine_id():

45
salt/utils/dns.py Normal file
View File

@ -0,0 +1,45 @@
# -*- coding: utf-8 -*-
import itertools # pylint: disable=W0403
import salt.utils.network
def parse_resolv(fp='/etc/resolv.conf'):
ns4 = []
ns6 = []
search = []
domain = ''
try:
with salt.utils.fopen(fp) as f:
for line in f:
line = line.strip().split()
try:
(directive, arg) = (line[0].lower(), line[1:])
if directive == 'nameserver':
ip_addr = arg[0]
if (salt.utils.network.is_ipv4(ip_addr) and
ip_addr not in ns4):
ns4.append(ip_addr)
elif (salt.utils.network.is_ipv6(ip_addr) and
ip_addr not in ns6):
ns6.append(ip_addr)
elif directive == 'domain':
domain = arg[0]
elif directive == 'search':
search = list(itertools.takewhile(
lambda x: x[0] not in ('#', ';'), arg))
except (IndexError, RuntimeError):
continue
return {
'nameservers': ns4 + ns6,
'ip4_nameservers': ns4,
'ip6_nameservers': ns6,
'domain': domain,
'search': search
}
except IOError:
return {}