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

Revert "Modify template loading"

Browse source 
This reverts commit 2ddd36f696.

Conflicts:

	salt/modules/rh_ip.py
	salt/modules/rh_netcfg.py
	salt/modules/rh_network.py
This commit is contained in:
Jeff Hutchins 2012-04-25 09:56:07 -06:00
parent 1bd6fd7e38
commit 4d09aac68f
3 changed files with 24 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
salt/modules/rh_ip.py
View file

@ -13,32 +13,8 @@ import jinja2
# Set up logging
log = logging.getLogger(__name__)
# Set up template environment and template strings
conf_jinja = '''alias {{name}} bonding
options {{name}} {% for item in bonding %}{{item}}={{bonding[item]}} {%endfor%}
'''
eth_jinja = '''{% if proto %}BOOTPROTO={{proto}}
{%endif%}DEVICE={{name}}
{% for server in dns -%}
DNS{{loop.index}}={{server}}
{% endfor -%}
{% if ethtool %}ETHTOOL_OPTS={%for item in ethtool %}{{item}} {{ethtool[item]}} {%endfor%}
{%endif%}{%if bonding %}BONDING_OPTS={%for item in bonding %}{{item}}={{bonding[item]}} {%endfor%}
{%endif%}{% if gateway %}GATEWAY={{gateway}}
{%endif%}{% if addr %}HWADDR={{addr}}
{%endif%}{% if ipaddr %}IPADDR={{ipaddr}}
{%endif%}{% if master %}MASTER={{master}}
{%endif%}{% if netmask %}NETMASK={{netmask}}
{%endif%}{% if onboot %}ONBOOT={{onboot}}
{%endif%}{% if peerdns %}PEERDNS={{peerdns}}
{%endif%}{% if slave %}SLAVE={{slave}}
{%endif%}{% if srcaddr %}SRCADDR={{srcaddr}}
{%endif%}{% if userctl %}USERCTL={{userctl}}
{%endif%}{% if userctl %}VLAN={{vlan}}{%endif%}
'''
env = jinja2.Environment()
# Set up template environment
env = jinja.Environment(loader=jinja.PackageLoader('salt.modules', 'rh_network'))
def __virtual__():
'''
@ -49,9 +25,6 @@ def __virtual__():
return 'ip'
return False
# Setup networking attributes
_ETHTOOL_CONFIG_OPTS = [
'autoneg', 'speed', 'duplex',
@ -557,7 +530,7 @@ def build_bond(iface, settings):
Create a bond script in /etc/modprobe.d
'''
opts = _parse_settings_bond(settings, iface)
template = env.from_string(conf_jinja)
template = env.from_string('conf_jinja')
data = template.render({'name': iface, 'bonding': opts})
_write_file(iface, data, _RH_NETWORK_CONF_FILES, '%s.conf')
path = join(_RH_NETWORK_CONF_FILES, '%s.conf' % iface)
@ -582,7 +555,7 @@ def build_interface(iface, type, settings):
if type in ['eth', 'bond', 'slave', 'vlan']:
opts = _parse_settings_eth(settings, iface)
template = env.from_string(eth_jinja)
template = env.from_string('eth_jinja')
ifcfg = template.render(opts)
_write_file(iface, ifcfg, _RH_NETWORK_SCRIPT_DIR, 'ifcfg-%s')

2
salt/modules/rh_network/conf.jinja Normal file
View file

@ -0,0 +1,2 @@
alias {{name}} bonding
options {{name}} {% for item in bonding %}{{item}}={{bonding[item]}} {%endfor%}

18
salt/modules/rh_network/eth.jinja Normal file
View file

@ -0,0 +1,18 @@
{% if proto %}BOOTPROTO={{proto}}
{%endif%}DEVICE={{name}}
{% for server in dns -%}
DNS{{loop.index}}={{server}}
{% endfor -%}
{% if ethtool %}ETHTOOL_OPTS={%for item in ethtool %}{{item}} {{ethtool[item]}} {%endfor%}
{%endif%}{%if bonding %}BONDING_OPTS={%for item in bonding %}{{item}}={{bonding[item]}} {%endfor%}
{%endif%}{% if gateway %}GATEWAY={{gateway}}
{%endif%}{% if addr %}HWADDR={{addr}}
{%endif%}{% if ipaddr %}IPADDR={{ipaddr}}
{%endif%}{% if master %}MASTER={{master}}
{%endif%}{% if netmask %}NETMASK={{netmask}}
{%endif%}{% if onboot %}ONBOOT={{onboot}}
{%endif%}{% if peerdns %}PEERDNS={{peerdns}}
{%endif%}{% if slave %}SLAVE={{slave}}
{%endif%}{% if srcaddr %}SRCADDR={{srcaddr}}
{%endif%}{% if userctl %}USERCTL={{userctl}}
{%endif%}{% if userctl %}VLAN={{vlan}}{%endif%}