Browse Source

snmpd: Use new APIs for node information.

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
Maximilian Wilhelm 4 years ago
parent
commit
47f55cc281
1 changed files with 3 additions and 4 deletions
  1. 3 4
      snmpd/snmpd.conf

+ 3 - 4
snmpd/snmpd.conf

@@ -1,9 +1,8 @@
 {%- set node_config = salt['pillar.get'] ('nodes:' ~ grains['id']) %}
 {%- set ro_community = salt['pillar.get'] ('globals:snmp:ro_community', "Configure globals:snmp:ro_community in pillar...") %}
 {%- set sys_contact = salt['pillar.get'] ('globals:ops_mail', "Configure globals:ops_mail in pillar...") %}
-{%- set sys_location = node_config.get ('sysLocation', "Please fix sysLocation...") %}
+{%- set sys_location = salt['pillar.get'] ('nodes:' ~ grains['id'] ~ 'location:site:code', node_config.get ('sysLocation', "Please fix sysLocation...")) %}
 {%- set nms_list = salt['pillar.get'] ('globals:snmp:nms_list', []) %}
-
 {%- set sites_config = salt['pillar.get'] ('sites', {}) %}
 {%- set ifaces = salt['ffho_net.get_interface_config'] (node_config, sites_config) %}
 
@@ -21,8 +20,8 @@ agentAddress  udp:127.0.0.1:161
 agentAddress  udp6:[::1]:161
 
 # Listen for connections on Loopback-IPs
-agentAddress  udp:{{ salt['ffho_net.get_loopback_ip'] (node_config, grains['id'], 'v4') }}:161
-agentAddress  udp6:[{{ salt['ffho_net.get_loopback_ip'] (node_config, grains['id'], 'v6') }}]:161
+agentAddress  udp:{{ salt['ffho_net.get_primary_ip'] (node_config, 'v4') }}:161
+agentAddress  udp6:[{{ salt['ffho_net.get_primary_ip'] (node_config, 'v6') }}]:161
 
 # We accept requests from those fine boxes
 rocommunity	{{ ro_community }}	127.0.0.1