fix ospf

2016-11-26 01:03:30 +01:00 · 2016-11-26 01:03:30 +01:00 · db70f1403d
parent 07efe1620d
commit db70f1403d
2 changed files with 2 additions and 3 deletions
--- a/salt-pillar/top.sls
+++ b/salt-pillar/top.sls
@ -4,7 +4,7 @@ base:
    - subnets
    - vlans
    - ospf
-  '*gw':
+  '*-gw':
    - dhcp
    - ospf.gw
  'anon1':
@ -17,4 +17,3 @@ base:
  'server1':
    - lxc-containers.server1
    - switches
-    - ospf.gw
--- a/salt/ospf/ospfd.conf
+++ b/salt/ospf/ospfd.conf
@ -20,7 +20,7 @@ router ospf

    network 172.20.72.0/21 area 0
    area 0 authentication message-digest
-{%- set redistribute = pillar['ospf']['redistribute'] %}
+{%- set redistribute = pillar['ospf'].get('redistribute') %}
 {%- if redistribute %}
 {%-   for kind in redistribute %}
    redistribute {{ kind }}