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

Merge pull request #8624 from garethgreenaway/develop

Browse Source 
Adding IPv6 configuration items to rh_ip.py
This commit is contained in:
Thomas S Hatch 2013-11-19 11:58:13 -08:00
commit 514a6f91e8
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/rh_ip.py
View File

@ -614,6 +614,16 @@ def _parse_settings_eth(opts, iface_type, enabled, iface):
if opt in opts:
result[opt] = opts[opt]
for opt in ['ipv6addr', 'ipv6gateway']:
if opt in opts:
result[opt] = opts[opt]
if 'ipv6_autoconf' in opts:
result['ipv6_autoconf'] = opts['ipv6_autoconf']
if 'enable_ipv6' in opts:
result['enable_ipv6'] = opts['enable_ipv6']
valid = _CONFIG_TRUE + _CONFIG_FALSE
for opt in ['peerdns', 'slave', 'vlan', 'defroute']:
if opt in opts:

6
salt/templates/rh_ip/rh5_eth.jinja
View File

@ -10,7 +10,11 @@ DEVICE={{name}}
{%endif%}{% if ipaddr %}IPADDR={{ipaddr}}
{%endif%}{% if netmask %}NETMASK={{netmask}}
{%endif%}{% if gateway %}GATEWAY={{gateway}}
{%endif%}{% if srcaddr %}SRCADDR={{srcaddr}}
{%endif%}{% if enable_ipv6 %}IPV6INIT="yes"
{% if ipv6_autoconf is defined %}IPV6_AUTOCONF="{{ipv6_autoconf}}"
{%endif%}{% if ipv6addr %}IPV6ADDR={{ipv6addr}}
{%endif%}{% if ipv6gateway %}IPV6_DEFAULTGW={{ipv6gateway}}
{%endif%}{%endif%}{% if srcaddr %}SRCADDR={{srcaddr}}
{%endif%}{% if peerdns %}PEERDNS={{peerdns}}
{%endif%}{% if bridge %}BRIDGE={{bridge}}
{%endif%}{% if delay %}DELAY={{delay}}

6
salt/templates/rh_ip/rh6_eth.jinja
View File

@ -10,7 +10,11 @@ DEVICE="{{name}}"
{%endif%}{% if ipaddr %}IPADDR="{{ipaddr}}"
{%endif%}{% if netmask %}NETMASK="{{netmask}}"
{%endif%}{% if gateway %}GATEWAY="{{gateway}}"
{%endif%}{% if srcaddr %}SRCADDR="{{srcaddr}}"
{%endif%}{% if enable_ipv6 %}IPV6INIT="yes"
{% if ipv6_autoconf %}IPV6_AUTOCONF="{{ipv6_autoconf}}"
{%endif%}{% if ipv6addr %}IPV6ADDR="{{ipv6addr}}"
{%endif%}{% if ipv6gateway %}IPV6_DEFAULTGW="{{ipv6gateway}}"
{%endif%}{%endif%}{% if srcaddr %}SRCADDR="{{srcaddr}}"
{%endif%}{% if peerdns %}PEERDNS="{{peerdns}}"
{%endif%}{% if defroute %}DEFROUTE="{{defroute}}"
{%endif%}{% if bridge %}BRIDGE="{{bridge}}"