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

Add support for PEERNTP network interface configuration on RH derived systems

Browse source
This commit is contained in:
Ask Bjørn Hansen 2014-08-19 17:10:57 -07:00 • committed by Ask Bjørn Hansen
parent 6d3927bed5
commit df3d6e817f
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/rh_ip.py
View file

@ -50,7 +50,7 @@ _ETHTOOL_CONFIG_OPTS = [
'gso', 'gro', 'lro'
]
_RH_CONFIG_OPTS = [
'domain', 'peerdns', 'defroute',
'domain', 'peerdns', 'peerntp', 'defroute',
'mtu', 'static-routes', 'gateway'
]
_RH_CONFIG_BONDING_OPTS = [
@ -644,7 +644,7 @@ def _parse_settings_eth(opts, iface_type, enabled, iface):
result['enable_ipv6'] = opts['enable_ipv6']
valid = _CONFIG_TRUE + _CONFIG_FALSE
for opt in ['onparent', 'peerdns', 'slave', 'vlan', 'defroute', 'stp']:
for opt in ['onparent', 'peerdns', 'peerntp', 'slave', 'vlan', 'defroute', 'stp']:
if opt in opts:
if opts[opt] in _CONFIG_TRUE:
result[opt] = 'yes'

1
salt/templates/rh_ip/rh5_eth.jinja
View file

@ -18,6 +18,7 @@ DEVICE={{name}}
{%endif%}{% if ipv6gateway %}IPV6_DEFAULTGW={{ipv6gateway}}
{%endif%}{%endif%}{% if srcaddr %}SRCADDR={{srcaddr}}
{%endif%}{% if peerdns %}PEERDNS={{peerdns}}
{%endif%}{% if peerntp %}PEERNTP={{peerntp}}
{%endif%}{% if bridge %}BRIDGE={{bridge}}
{%endif%}{% if stp %}STP={{stp}}
{%endif%}{% if delay or delay == 0 %}DELAY={{delay}}

1
salt/templates/rh_ip/rh6_eth.jinja
View file

@ -18,6 +18,7 @@ DEVICE="{{name}}"
{%endif%}{% if ipv6gateway %}IPV6_DEFAULTGW="{{ipv6gateway}}"
{%endif%}{%endif%}{% if srcaddr %}SRCADDR="{{srcaddr}}"
{%endif%}{% if peerdns %}PEERDNS="{{peerdns}}"
{%endif%}{% if peerntp %}PEERNTP="{{peerntp}}"
{%endif%}{% if defroute %}DEFROUTE="{{defroute}}"
{%endif%}{% if bridge %}BRIDGE="{{bridge}}"
{%endif%}{% if stp %}STP="{{stp}}"

1
salt/templates/rh_ip/rh7_eth.jinja
View file

@ -18,6 +18,7 @@ DEVICE="{{name}}"
{%endif%}{% if ipv6gateway %}IPV6_DEFAULTGW="{{ipv6gateway}}"
{%endif%}{%endif%}{% if srcaddr %}SRCADDR="{{srcaddr}}"
{%endif%}{% if peerdns %}PEERDNS="{{peerdns}}"
{%endif%}{% if peerntp %}PEERNTP="{{peerntp}}"
{%endif%}{% if defroute %}DEFROUTE="{{defroute}}"
{%endif%}{% if bridge %}BRIDGE="{{bridge}}"
{%endif%}{% if stp %}STP="{{stp}}"