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 #47930 from rallytime/bp-47725

Browse source 
Back-port #47725 to 2018.3
This commit is contained in:
Nicole Thomas 2018-06-04 10:38:57 -04:00 • committed by GitHub
commit d05a6c70d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
salt/beacons/network_settings.py
View file

@ -58,14 +58,18 @@ def validate(config):
_config = {}
list(map(_config.update, config))
for item in _config.get('interfaces', {}):
interfaces = _config.get('interfaces', {})
if isinstance(interfaces, list):
#Old syntax
return False, ('interfaces section for network_settings beacon'
' must be a dictionary.')
for item in interfaces:
if not isinstance(_config['interfaces'][item], dict):
return False, ('Configuration for network_settings beacon '
' must be a list of dictionaries.')
else:
if not all(j in ATTRS for j in _config['interfaces'][item]):
return False, ('Invalid configuration item in Beacon '
'configuration.')
return False, ('Interface attributes for network_settings beacon'
' must be a dictionary.')
if not all(j in ATTRS for j in _config['interfaces'][item]):
return False, ('Invalid attributes in beacon configuration.')
return True, 'Valid beacon configuration'
@ -103,12 +107,12 @@ def beacon(config):
beacons:
network_settings:
- interfaces:
- eth0:
ipaddr:
promiscuity:
onvalue: 1
- eth1:
linkmode:
eth0:
ipaddr:
promiscuity:
onvalue: 1
eth1:
linkmode:
The config above will check for value changes on eth0 ipaddr and eth1 linkmode. It will also
emit if the promiscuity value changes to 1.
@ -125,9 +129,9 @@ def beacon(config):
network_settings:
- coalesce: True
- interfaces:
- eth0:
ipaddr:
promiscuity:
eth0:
ipaddr:
promiscuity:
'''
_config = {}