Merge pull request #3397 from vyos/mergify/bp/equuleus/pr-33861.3.7

T6056: Change static-host-mapping should not restart snmpd (backport #3386)

1 files changed, 8 insertions, 2 deletions

diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py
index 1e4667cac..8363e585e 100755
--- a/src/conf_mode/host_name.py
+++ b/src/conf_mode/host_name.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018-2021 VyOS maintainers and contributors
+# Copyright (C) 2018-2024 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -23,6 +23,7 @@ import vyos.hostsd_client
 
 from vyos import ConfigError
 from vyos.config import Config
+from vyos.configdict import leaf_node_changed
 from vyos.ifconfig import Section
 from vyos.template import is_ip
 from vyos.util import cmd
@@ -37,6 +38,7 @@ default_config_data = {
     'domain_search': [],
     'nameserver': [],
     'nameservers_dhcp_interfaces': {},
+    'snmpd_restart_reqired': False,
     'static_host_mapping': {}
 }
 
@@ -52,6 +54,10 @@ def get_config(config=None):
 
     hosts['hostname'] = conf.return_value(['system', 'host-name'])
 
+    base = ['system']
+    if leaf_node_changed(conf, base + ['host-name']) or leaf_node_changed(conf, base + ['domain-name']):
+        hosts['snmpd_restart_reqired'] = True
+
     # This may happen if the config is not loaded yet,
     # e.g. if run by cloud-init
     if not hosts['hostname']:
@@ -170,7 +176,7 @@ def apply(config):
         call("systemctl restart rsyslog.service")
 
     # If SNMP is running, restart it too
-    if process_named_running('snmpd'):
+    if process_named_running('snmpd') and config['snmpd_restart_reqired']:
         call('systemctl restart snmpd.service')
 
     return None