diff options
| -rw-r--r-- | data/templates/lldp/lldpd.tmpl | 2 | ||||
| -rw-r--r-- | data/templates/lldp/vyos.conf.tmpl | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/templates/lldp/lldpd.tmpl b/data/templates/lldp/lldpd.tmpl index 819e70c84..9ab1e4367 100644 --- a/data/templates/lldp/lldpd.tmpl +++ b/data/templates/lldp/lldpd.tmpl @@ -1,2 +1,2 @@ ### Autogenerated by lldp.py ### -DAEMON_ARGS="-M 4{% if snmp is defined and snmp.enable is defined %} -x{% endif %}{% if legacy_protocols is defined and legacy_protocols.cdp is defined %} -c{% endif %}{% if legacy_protocols is defined and legacy_protocols.edp is defined %} -e{% endif %}{% if legacy_protocols is defined and legacy_protocols.fdp is defined %} -f{% endif %}{% if legacy_protocols is defined and legacy_protocols.sonmp is defined %} -s{% endif %}" +DAEMON_ARGS="-M 4{% if snmp.enable is vyos_defined %} -x{% endif %}{% if legacy_protocols.cdp is vyos_defined %} -c{% endif %}{% if legacy_protocols.edp is vyos_defined %} -e{% endif %}{% if legacy_protocols.fdp is vyos_defined %} -f{% endif %}{% if legacy_protocols.sonmp is vyos_defined %} -s{% endif %}" diff --git a/data/templates/lldp/vyos.conf.tmpl b/data/templates/lldp/vyos.conf.tmpl index 14395a223..c34a851aa 100644 --- a/data/templates/lldp/vyos.conf.tmpl +++ b/data/templates/lldp/vyos.conf.tmpl @@ -2,24 +2,24 @@ configure system platform VyOS configure system description "VyOS {{ version }}" -{% if interface is defined and interface is not none %} +{% if interface is vyos_defined %} {% set tmp = [] %} {% for iface, iface_options in interface.items() if not iface_options.disable %} {% if iface == 'all' %} {% set iface = '*' %} {% endif %} {% set _ = tmp.append(iface) %} -{% if iface_options.location is defined and iface_options.location is not none %} -{% if iface_options.location.elin is defined and iface_options.location.elin is not none %} +{% if iface_options.location is vyos_defined %} +{% if iface_options.location.elin is vyos_defined %} configure ports {{ iface }} med location elin "{{ iface_options.location.elin }}" {% endif %} -{% if iface_options.location is defined and iface_options.location.coordinate_based is defined and iface_options.location.coordinate_based is not none %} +{% if iface_options.location.coordinate_based is vyos_defined %} configure ports {{ iface }} med location coordinate latitude "{{ iface_options.location.coordinate_based.latitude }}" longitude "{{ iface_options.location.coordinate_based.longitude }}" altitude "{{ iface_options.location.coordinate_based.altitude }}m" datum "{{ iface_options.location.coordinate_based.datum }}" {% endif %} {% endif %} {% endfor %} configure system interface pattern "{{ tmp | join(",") }}" {% endif %} -{% if management_address is defined and management_address is not none %} +{% if management_address is vyos_defined %} configure system ip management pattern {{ management_address | join(",") }} {% endif %} |