diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-09-15 18:51:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-15 18:51:43 +0200 |
| commit | 3cd0ef72825dcd2e1a17da7bfe66fc1ce26b315a (patch) | |
| tree | 767976e18938771c8e84ff0843b72bcca7e04a4f | |
| parent | c5498ec219d02c1f671c0ff8b8e780d684ee24b0 (diff) | |
| parent | 0c94a95a2de541edd3bce487c48a269b91a60ae9 (diff) | |
| download | vyos-1x-3cd0ef72825dcd2e1a17da7bfe66fc1ce26b315a.tar.gz vyos-1x-3cd0ef72825dcd2e1a17da7bfe66fc1ce26b315a.zip | |
Merge pull request #2274 from vyos/mergify/bp/sagitta/pr-2273
T5586: Disable by default SNMP for Keeplived VRRP service (backport #2273)
| -rw-r--r-- | data/templates/high-availability/10-override.conf.j2 | 2 | ||||
| -rw-r--r-- | interface-definitions/high-availability.xml.in | 4 | ||||
| -rwxr-xr-x | src/conf_mode/high-availability.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/templates/high-availability/10-override.conf.j2 b/data/templates/high-availability/10-override.conf.j2 index d1cb25581..c153f09b4 100644 --- a/data/templates/high-availability/10-override.conf.j2 +++ b/data/templates/high-availability/10-override.conf.j2 @@ -1,5 +1,5 @@ ### Autogenerated by ${vyos_conf_scripts_dir}/high-availability.py ### -{% set snmp = '' if vrrp.disable_snmp is vyos_defined else '--snmp' %} +{% set snmp = '--snmp' if vrrp.snmp is vyos_defined else '' %} [Unit] After=vyos-router.service # Only start if there is our configuration file - remove Debian default diff --git a/interface-definitions/high-availability.xml.in b/interface-definitions/high-availability.xml.in index 47a772d04..aa23888a4 100644 --- a/interface-definitions/high-availability.xml.in +++ b/interface-definitions/high-availability.xml.in @@ -12,10 +12,10 @@ <help>Virtual Router Redundancy Protocol settings</help> </properties> <children> - <leafNode name="disable-snmp"> + <leafNode name="snmp"> <properties> <valueless/> - <help>Disable SNMP</help> + <help>Enable SNMP</help> </properties> </leafNode> <node name="global-parameters"> diff --git a/src/conf_mode/high-availability.py b/src/conf_mode/high-availability.py index 70f43ab52..b3b27b14e 100755 --- a/src/conf_mode/high-availability.py +++ b/src/conf_mode/high-availability.py @@ -59,7 +59,7 @@ def get_config(config=None): if conf.exists(conntrack_path): ha['conntrack_sync_group'] = conf.return_value(conntrack_path) - if leaf_node_changed(conf, base + ['vrrp', 'disable-snmp']): + if leaf_node_changed(conf, base + ['vrrp', 'snmp']): ha.update({'restart_required': {}}) return ha |