Просмотр исходного кода

Remove use of old globals state.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
Maximilian Wilhelm 7 лет назад
Родитель
Сommit
49e8d1a9cd
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      snmpd/snmpd.conf

+ 2 - 2
snmpd/snmpd.conf

@@ -1,4 +1,3 @@
-{%- import "globals.sls" as globals with context %}
 {%- set node_config = salt['pillar.get'] ('nodes:' ~ grains['id']) %}
 {%- set ro_community = salt['pillar.get'] ('ffho:snmp:ro_community', "Configure ffho:snmp:ro_community in pillar...") %}
 {%- set sys_location = node_config.get ('sysLocation', "Please fix sysLocation...") %}
@@ -28,8 +27,9 @@ sysServices    72
 #
 # Network interfaces
 #
-{%- if 'gateway' in globals.ROLES %}
+{%- if 'gateway' in node_config.get ('roles', []) %}
 # Set B.A.T.M.A.N. related devices to 100 MBit/s
+# FIXME: For all sites 'n stuff
 interface	bat0		6	100000000
 interface	inter-gw-vpn	6	100000000
 interface	mesh-vpn-v4	6	100000000