From 03a2ab8bbe647dda541c8eb3a4e38df3821f1fd1 Mon Sep 17 00:00:00 2001 From: zsdc Date: Mon, 26 Dec 2022 17:10:40 +0200 Subject: user-data: T4895: Fixed tag nodes processing This commit fixes the problem with overwritting tag nodes by neighbors, when there are more than one tag node on the same level. --- cloudinit/config/cc_vyos_userdata.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cloudinit/config/cc_vyos_userdata.py b/cloudinit/config/cc_vyos_userdata.py index 5ad27b31..21deb3d6 100644 --- a/cloudinit/config/cc_vyos_userdata.py +++ b/cloudinit/config/cc_vyos_userdata.py @@ -134,10 +134,12 @@ def mark_tag(config, node_path, tag_nodes): # apply "set" command def apply_command_set(config, tag_nodes, multi_nodes, command): # if a node is multi type add value instead replacing - replace_option = not inside_nodes_list(command['cmd_path'], multi_nodes) + replace_option = not inside_nodes_list(command['cmd_path'], + multi_nodes + tag_nodes) if not replace_option: - logger.debug("{} is a multi node, adding value".format( - command['cmd_path'])) + logger.debug( + "{} is a multi or tag node, adding value instead overwriting". + format(command['cmd_path'])) config.set(command['cmd_path'], command['cmd_value'], -- cgit v1.2.3