diff options
| author | Daniil Baturin <daniil@baturin.org> | 2021-01-27 13:10:23 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2021-01-27 13:10:23 +0100 |
| commit | 9d77ed154543837a42266b327c602c69ac944d1d (patch) | |
| tree | 76cc4b91e1bc068f7d288620be822487b4106c16 | |
| parent | b7dbcaa88f2f9f5e3e39f5468e4a8b3fdcab2776 (diff) | |
| parent | f0ae68502eabfb0004dfd7272925fae8738d828a (diff) | |
| download | vyatta-cfg-quagga-9d77ed154543837a42266b327c602c69ac944d1d.tar.gz vyatta-cfg-quagga-9d77ed154543837a42266b327c602c69ac944d1d.zip | |
Merge branch 'crux' of https://github.com/vyos/vyatta-cfg-quagga into crux
| -rwxr-xr-x | scripts/bgp/vyatta-bgp.pl | 4 | ||||
| -rw-r--r-- | scripts/vyos-update-rpki-cache.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl index 757b6399..e7f9943b 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -499,6 +499,10 @@ my %qcom = ( set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 soft-reconfiguration inbound', del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 soft-reconfiguration inbound', }, + 'protocols bgp var neighbor var address-family ipv4-unicast unsuppress-map' => { + set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 unsuppress-map #9', + del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 unsuppress-map #9', + }, 'protocols bgp var neighbor var remote-as' => { set => 'router bgp #3 ; neighbor #5 remote-as #7 ; neighbor #5 activate', del => 'router bgp #3 ; no neighbor #5 remote-as #7', diff --git a/scripts/vyos-update-rpki-cache.py b/scripts/vyos-update-rpki-cache.py index df6f01bc..f290d119 100644 --- a/scripts/vyos-update-rpki-cache.py +++ b/scripts/vyos-update-rpki-cache.py @@ -18,7 +18,7 @@ def create_cache(c, cache): ssh = True new_user = c.return_value(base_path + "cache {0} ssh username".format(cache)) new_pubkey = c.return_value(base_path + "cache {0} ssh public-key-file".format(cache)) - new_privkey = c.return__value(base_path + "cache {0} ssh private-key-file".format(cache)) + new_privkey = c.return_value(base_path + "cache {0} ssh private-key-file".format(cache)) new_known_hosts = c.return_value(base_path + "cache {0} ssh known-hosts-file".format(cache)) if (not new_user) or (not new_pubkey) or (not new_privkey) or (not new_known_hosts): |