|
|
@ -70,13 +70,26 @@ interfaces {
|
|
|
|
{% if iface_data['lag'] %}bond-group {{ iface_data['lag']['name'] }}{% endif %}
|
|
|
|
{% if iface_data['lag'] %}bond-group {{ iface_data['lag']['name'] }}{% endif %}
|
|
|
|
|
|
|
|
|
|
|
|
{% for tagged_vlan in iface_data['tagged_vlans'] %}
|
|
|
|
{% for tagged_vlan in iface_data['tagged_vlans'] %}
|
|
|
|
{% set subiface_data = salt['pillar.get']('netbox:interfaces:%s.%04d'%(iface_name,tagged_vlan['vid']),{'description':'','addresses':[],'enabled':False}) %}
|
|
|
|
{% set subiface_data = salt['pillar.get']('netbox:interfaces:%s.%d'%(iface_name,tagged_vlan['vid']),{'description':'','addresses':[],'enabled':False}) %}
|
|
|
|
vif {{ tagged_vlan['vid'] }} {
|
|
|
|
vif {{ tagged_vlan['vid'] }} {
|
|
|
|
description "{{ tagged_vlan['name'].replace('"','\\"') or "-" }} => {{ subiface_data['description'].replace('"','\\"') or "-" }}"
|
|
|
|
description "{{ tagged_vlan['name'].replace('"','\\"') or "-" }} => {{ subiface_data['description'].replace('"','\\"') or "-" }}"
|
|
|
|
{% for address in subiface_data['addresses'] %}
|
|
|
|
{% for address in subiface_data['addresses'] %}
|
|
|
|
address {{ address['address'] }}
|
|
|
|
address {{ address['address'] }}
|
|
|
|
{% endfor %}
|
|
|
|
{% endfor %}
|
|
|
|
{% if not subiface_data['enabled'] %}disable{% endif %}
|
|
|
|
{% if not subiface_data['enabled'] %}disable{% endif %}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{% if salt['pillar.get']('interfaces:'+iface_name+"."+("%d"%tagged_vlan['vid'])+':ip') %}
|
|
|
|
|
|
|
|
ip {
|
|
|
|
|
|
|
|
{{ interface_ip_ospf(iface_name+"."+("%d"%tagged_vlan['vid'])) }}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
{% endif %}
|
|
|
|
|
|
|
|
{% if salt['pillar.get']('interfaces:'+iface_name+"."+("%d"%tagged_vlan['vid'])+':ipv6') %}
|
|
|
|
|
|
|
|
ipv6 {
|
|
|
|
|
|
|
|
dup-addr-detect-transmits 1
|
|
|
|
|
|
|
|
{{ interface_ipv6_ospfv3(iface_name+"."+("%d"%tagged_vlan['vid'])) }}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
{% endif %}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
{% endfor %}
|
|
|
|
{% endfor %}
|
|
|
|
|
|
|
|
|
|
|
@ -1030,6 +1043,11 @@ system {
|
|
|
|
all net.ipv4.conf.default.rp_filter {
|
|
|
|
all net.ipv4.conf.default.rp_filter {
|
|
|
|
value 2
|
|
|
|
value 2
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{% for sysctl, value in salt['pillar.get']('system:sysctl:custom', {}).items() %}
|
|
|
|
|
|
|
|
custom {{ sysctl }} {
|
|
|
|
|
|
|
|
value {{ value }}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
{% endfor %}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
syslog {
|
|
|
|
syslog {
|
|
|
|