diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-09-27 20:43:02 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-09-27 20:43:20 +0200 |
| commit | f4732f348ff4b0a9d82ec698f4a8b3c6107f9101 (patch) | |
| tree | 2b23bfef00b4bf1d6f1490538ea12158d43e21b0 | |
| parent | 0f25b50ea8c0bf4b92a93db9392066d99d354449 (diff) | |
| download | vyos-1x-f4732f348ff4b0a9d82ec698f4a8b3c6107f9101.tar.gz vyos-1x-f4732f348ff4b0a9d82ec698f4a8b3c6107f9101.zip | |
frr: T2175: rename daemon Jinja2 templates to match (d)aemon suffix
| -rw-r--r-- | data/templates/frr/bfdd.frr.tmpl (renamed from data/templates/frr/bfd.frr.tmpl) | 0 | ||||
| -rw-r--r-- | data/templates/frr/ripd.frr.tmpl (renamed from data/templates/frr/rip.frr.tmpl) | 0 | ||||
| -rw-r--r-- | data/templates/frr/ripngd.frr.tmpl (renamed from data/templates/frr/ripng.frr.tmpl) | 0 | ||||
| -rw-r--r-- | data/templates/frr/staticd.frr.tmpl (renamed from data/templates/frr/static.frr.tmpl) | 0 | ||||
| -rwxr-xr-x | src/conf_mode/protocols_bfd.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/protocols_rip.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/protocols_ripng.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/protocols_static.py | 2 |
8 files changed, 4 insertions, 4 deletions
diff --git a/data/templates/frr/bfd.frr.tmpl b/data/templates/frr/bfdd.frr.tmpl index 16f8be92c..16f8be92c 100644 --- a/data/templates/frr/bfd.frr.tmpl +++ b/data/templates/frr/bfdd.frr.tmpl diff --git a/data/templates/frr/rip.frr.tmpl b/data/templates/frr/ripd.frr.tmpl index cabc236f0..cabc236f0 100644 --- a/data/templates/frr/rip.frr.tmpl +++ b/data/templates/frr/ripd.frr.tmpl diff --git a/data/templates/frr/ripng.frr.tmpl b/data/templates/frr/ripngd.frr.tmpl index 25df15121..25df15121 100644 --- a/data/templates/frr/ripng.frr.tmpl +++ b/data/templates/frr/ripngd.frr.tmpl diff --git a/data/templates/frr/static.frr.tmpl b/data/templates/frr/staticd.frr.tmpl index db59a44c2..db59a44c2 100644 --- a/data/templates/frr/static.frr.tmpl +++ b/data/templates/frr/staticd.frr.tmpl diff --git a/src/conf_mode/protocols_bfd.py b/src/conf_mode/protocols_bfd.py index 348bae59f..539fd7b8e 100755 --- a/src/conf_mode/protocols_bfd.py +++ b/src/conf_mode/protocols_bfd.py @@ -92,7 +92,7 @@ def generate(bfd): bfd['new_frr_config'] = '' return None - bfd['new_frr_config'] = render_to_string('frr/bfd.frr.tmpl', bfd) + bfd['new_frr_config'] = render_to_string('frr/bfdd.frr.tmpl', bfd) def apply(bfd): # Save original configuration prior to starting any commit actions diff --git a/src/conf_mode/protocols_rip.py b/src/conf_mode/protocols_rip.py index e56eb1f56..6b78f6f2d 100755 --- a/src/conf_mode/protocols_rip.py +++ b/src/conf_mode/protocols_rip.py @@ -93,7 +93,7 @@ def generate(rip): rip['new_frr_config'] = '' return None - rip['new_frr_config'] = render_to_string('frr/rip.frr.tmpl', rip) + rip['new_frr_config'] = render_to_string('frr/ripd.frr.tmpl', rip) return None diff --git a/src/conf_mode/protocols_ripng.py b/src/conf_mode/protocols_ripng.py index aaec5dacb..bc4954f63 100755 --- a/src/conf_mode/protocols_ripng.py +++ b/src/conf_mode/protocols_ripng.py @@ -95,7 +95,7 @@ def generate(ripng): ripng['new_frr_config'] = '' return None - ripng['new_frr_config'] = render_to_string('frr/ripng.frr.tmpl', ripng) + ripng['new_frr_config'] = render_to_string('frr/ripngd.frr.tmpl', ripng) return None def apply(ripng): diff --git a/src/conf_mode/protocols_static.py b/src/conf_mode/protocols_static.py index 338247e30..597fcc443 100755 --- a/src/conf_mode/protocols_static.py +++ b/src/conf_mode/protocols_static.py @@ -80,7 +80,7 @@ def verify(static): return None def generate(static): - static['new_frr_config'] = render_to_string('frr/static.frr.tmpl', static) + static['new_frr_config'] = render_to_string('frr/staticd.frr.tmpl', static) return None def apply(static): |