diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-10-31 17:24:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-31 17:24:19 +0000 |
| commit | 67d65b70c2d63c86fa0dc63e8720d332dc3b6643 (patch) | |
| tree | 6a1bf0c52c9cf09916bf81d7a687ae31e2c408e4 /src/conf_mode | |
| parent | ab98f66de7ee115fed89c5304b99cc7bcbecbbcc (diff) | |
| parent | 5a6938a2e14373dfaa72211fe18deeb257d3ba12 (diff) | |
| download | vyos-1x-67d65b70c2d63c86fa0dc63e8720d332dc3b6643.tar.gz vyos-1x-67d65b70c2d63c86fa0dc63e8720d332dc3b6643.zip | |
Merge pull request #2310 from sever-sever/T5586-eq
T5586: Disable by default SNMP for Keeplived VRRP service
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/vrrp.py | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/conf_mode/vrrp.py b/src/conf_mode/vrrp.py index 86b11b6c4..b53294e64 100755 --- a/src/conf_mode/vrrp.py +++ b/src/conf_mode/vrrp.py @@ -24,6 +24,7 @@ from ipaddress import IPv6Interface from vyos.config import Config from vyos.configdict import dict_merge +from vyos.configdict import leaf_node_changed from vyos.ifconfig.vrrp import VRRP from vyos.template import render from vyos.template import is_ipv4 @@ -36,6 +37,10 @@ from vyos import ConfigError from vyos import airbag airbag.enable() + +systemd_override = r'/run/systemd/system/keepalived.service.d/10-override.conf' + + def get_config(config=None): if config: conf = config @@ -60,6 +65,9 @@ def get_config(config=None): if conf.exists(conntrack_path): vrrp['conntrack_sync_group'] = conf.return_value(conntrack_path) + if leaf_node_changed(conf, base + ['snmp']): + vrrp.update({'restart_required': {}}) + return vrrp def verify(vrrp): @@ -138,13 +146,17 @@ def verify(vrrp): def generate(vrrp): if not vrrp: + if os.path.isfile(systemd_override): + os.unlink(systemd_override) return None render(VRRP.location['config'], 'vrrp/keepalived.conf.tmpl', vrrp) + render(systemd_override, 'vrrp/10-override.conf.j2', vrrp) return None def apply(vrrp): service_name = 'keepalived.service' + call('systemctl daemon-reload') if not vrrp: call(f'systemctl stop {service_name}') return None @@ -163,10 +175,11 @@ def apply(vrrp): # XXX: T3944 - reload keepalived configuration if service is already running # to not cause any service disruption when applying changes. - if is_systemd_service_running(service_name): - call(f'systemctl reload {service_name}') - else: - call(f'systemctl restart {service_name}') + systemd_action = 'reload-or-restart' + if 'restart_required' in vrrp: + systemd_action = 'restart' + + call(f'systemctl {systemd_action} {service_name}') return None if __name__ == '__main__': |