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
1 changed files with 12 additions and 13 deletions

View File

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