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 #27223 from M2Mobi/zone

Browse source 
Support firewalld per interface zone config on rh7 systems
This commit is contained in:
Justin Findlay 2015-09-18 13:44:45 -06:00
commit 80a45b74ed
2 changed files with 3 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

@ -51,7 +51,7 @@ _ETHTOOL_CONFIG_OPTS = [
]
_RH_CONFIG_OPTS = [
'domain', 'peerdns', 'peerntp', 'defroute',
'mtu', 'static-routes', 'gateway'
'mtu', 'static-routes', 'gateway', 'zone'
]
_RH_CONFIG_BONDING_OPTS = [
'mode', 'miimon', 'arp_interval',
@ -624,7 +624,7 @@ def _parse_settings_eth(opts, iface_type, enabled, iface):
if iface_type == 'ib':
result['devtype'] = 'InfiniBand'
for opt in ['ipaddr', 'master', 'netmask', 'srcaddr', 'delay', 'domain', 'gateway']:
for opt in ['ipaddr', 'master', 'netmask', 'srcaddr', 'delay', 'domain', 'gateway', 'zone']:
if opt in opts:
result[opt] = opts[opt]

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

@ -24,6 +24,7 @@ DEVICE="{{name}}"
{%endif%}{% if stp %}STP="{{stp}}"
{%endif%}{% if delay or delay == 0 %}DELAY="{{delay}}"
{%endif%}{% if mtu %}MTU="{{mtu}}"
{%endif%}{% if zone %}ZONE="{{zone}}"
{%endif%}{% if my_inner_ipaddr %}MY_INNER_IPADDR={{my_inner_ipaddr}}
{%endif%}{% if my_outer_ipaddr %}MY_OUTER_IPADDR={{my_outer_ipaddr}}
{%endif%}{% if bonding %}BONDING_OPTS="{%for item in bonding %}{{item}}={{bonding[item]}} {%endfor%}"