salt-pillar/top.sls: add bird.ospf to more hosts, reorder similar to salt/top.sls

This commit is contained in:
Astro 2017-01-20 02:31:17 +01:00
parent ff3abbc5d3
commit 2a2d6153c1

View File

@ -3,36 +3,35 @@ base:
- hosts
- subnets
- vlans
'server1':
- lxc-containers.server1
- bird.ospf
- switches
- cpe.aps
'priv*-gw':
- dhcp
- bird.radv
- bird.ospf
'pub-gw':
'pub-gw or serv-gw':
- bird.ospf
- dhcp
- bird.radv
- bird.ospf
'serv-gw':
- dhcp
- bird.radv
- bird.ospf
'c3d2-gw or c3d2-anon':
- bird.ospf
'bgp':
- bird.ospf
- bird.bgp
'anon1':
- vpn.anon1
- upstream.anon1
'upstream*':
- bird.ospf
# for forward-zones in unbound
- bind.dns
'upstream1':
- upstream.upstream1
'upstream2':
- upstream.upstream2
'server1':
- lxc-containers.server1
- switches
- cpe.aps
'anon*':
- bird.ospf
- vpn.anon1
- upstream.anon1
'dns':
- bind.dns