FAELIX/hphr
FAELIX/hphr
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

newer versions of VyOS reject config with same prefix+length

Browse Source
This commit is contained in:
Marek Isalski 2020-12-27 22:07:23 +00:00
parent f2e306899e
commit 132ae74c2d
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vyos.conf.j2
View File

@ -660,11 +660,6 @@ policy {
le 32 le 32
action permit action permit
} }
rule 65535 {
prefix 0.0.0.0/0
le 32
action deny
}
} }
prefix-list hphr-DFZ-DEFAULT-IPv4 { prefix-list hphr-DFZ-DEFAULT-IPv4 {
@ -850,11 +845,6 @@ policy {
le 32 le 32
action permit action permit
} }
rule 65535 {
prefix 0.0.0.0/0
le 32
action deny
}
} }
prefix-list6 hphr-NO-IPv6 { prefix-list6 hphr-NO-IPv6 {
@ -1347,9 +1337,8 @@ policy {
{% for prefix_list_name, prefix_data in peeringdb_prefixlist_4.items() %} {% for prefix_list_name, prefix_data in peeringdb_prefixlist_4.items() %}
prefix-list {{ prefix_list_name }} { prefix-list {{ prefix_list_name }} {
{% if prefix_data['as-set'] %} {% if prefix_data['as-set'] %}
{% set jsonblob = salt['cmd.run']('/tmp/bgpq3 -A -4 -S ' + prefix_data["sources"] + ' -j ' + prefix_data["as-set"], env={'BIND_ADDR':pillar['loopback']['IPv4'], 'BIND_ADDR6':pillar['loopback']['IPv6'], 'LD_PRELOAD':'/tmp/bind.so'})|load_json %} {% set jsonblob = salt['cmd.run']('/tmp/bgpq3 -m 24 -R 24 -A -4 -S ' + prefix_data["sources"] + ' -j ' + prefix_data["as-set"], env={'BIND_ADDR':pillar['loopback']['IPv4'], 'BIND_ADDR6':pillar['loopback']['IPv6'], 'LD_PRELOAD':'/tmp/bind.so'})|load_json %}
{#% set jsonblob = salt['cmd.run']('/tmp/bgpq3 -A -4 -j ' + prefix_data["as-set"], env={'BIND_ADDR':pillar['loopback']['IPv4'], 'BIND_ADDR6':pillar['loopback']['IPv6'], 'LD_PRELOAD':'/tmp/bind.so'})|load_json %#} {#% set jsonblob = salt['cmd.run']('/tmp/bgpq3 -A -4 -j ' + prefix_data["as-set"], env={'BIND_ADDR':pillar['loopback']['IPv4'], 'BIND_ADDR6':pillar['loopback']['IPv6'], 'LD_PRELOAD':'/tmp/bind.so'})|load_json %#}
/* {{ '/tmp/bgpq3 -A -4 -j ' + prefix_data["as-set"] }} */
{% for prefix in jsonblob.NN %} {% for prefix in jsonblob.NN %}
rule {{ loop.index }} { rule {{ loop.index }} {
action permit action permit
@ -1370,7 +1359,7 @@ policy {
{% for prefix_list_name, prefix_data in salt['pillar.get']("policy:prefix-list",{}).items() %} {% for prefix_list_name, prefix_data in salt['pillar.get']("policy:prefix-list",{}).items() %}
prefix-list6 {{ prefix_list_name }} { prefix-list6 {{ prefix_list_name }} {
{% if 'bgpq3' in prefix_data %} {% if 'bgpq3' in prefix_data %}
{% set jsonblob = salt['cmd.run']('/tmp/bgpq3 -A -6 -j ' + prefix_data["bgpq3"]["IPv6"], env={'BIND_ADDR':pillar['loopback']['IPv4'], 'BIND_ADDR6':pillar['loopback']['IPv6'], 'LD_PRELOAD':'/tmp/bind.so'})|load_json %} {% set jsonblob = salt['cmd.run']('/tmp/bgpq3 -m 64 -R 64 -A -6 -j ' + prefix_data["bgpq3"]["IPv6"], env={'BIND_ADDR':pillar['loopback']['IPv4'], 'BIND_ADDR6':pillar['loopback']['IPv6'], 'LD_PRELOAD':'/tmp/bind.so'})|load_json %}
{% for prefix in jsonblob.NN %} {% for prefix in jsonblob.NN %}
rule {{ loop.index }} { rule {{ loop.index }} {
action permit action permit