merge_vars: fix shared-prefix conflicts

Example: the suffix "files__to_merge" also matches
"wireless_profiles__to_merge" which caused funny issues.

Let's also match on the leading underscores to prevent that.

Author: pktpls

group_vars/all/general.yml

@@ -32,7 +32,7 @@ sysupgrade_preserve_custom_files:
 
 image_search_pattern: "*-sysupgrade.*"
 
-all_sysctl__to_merge:
+all__sysctl__to_merge:
   # when oom kicks in most likely something broke. Panic/Reboot then
   vm.panic_on_oom: 1
 

group_vars/role_corerouter/general.yml

@@ -2,5 +2,5 @@
 
 wireless_profile: disable
 
-role_corerouter_sysctl__to_merge:
+role_corerouter__sysctl__to_merge:
   net.netfilter.nf_conntrack_max: 131072

group_vars/role_gateway/general.yml

@@ -21,7 +21,7 @@ freifunk_wahlkreis_announcement_prefix: 44
 local_asn: 44194
 peer_asn: 25291
 
-role_gateway_sysctl__to_merge:
+role_gateway__sysctl__to_merge:
   net.netfilter.nf_conntrack_max: 524288
 
 ## WIREGUARD SECTION

roles/cfg_openwrt/tasks/merge_vars.yml

@@ -1,44 +1,44 @@
 ---
 - name: Merge packages variable
   merge_vars:
-    suffix_to_merge: packages__to_merge
+    suffix_to_merge: __packages__to_merge
     merged_var_name: packages
     expected_type: list
 
 - name: Merge disabled_services variable
   merge_vars:
-    suffix_to_merge: disabled_services__to_merge
+    suffix_to_merge: __disabled_services__to_merge
     merged_var_name: disabled_services
     expected_type: list
 
 - name: Merge wireless_profiles variable
   merge_vars:
-    suffix_to_merge: wireless_profiles__to_merge
+    suffix_to_merge: __wireless_profiles__to_merge
     merged_var_name: wireless_profiles
     expected_type: list
 
 - name: Merge ssh_keys variable
   merge_vars:
-    suffix_to_merge: ssh_keys__to_merge
+    suffix_to_merge: __ssh_keys__to_merge
     merged_var_name: ssh_keys
     expected_type: list
   when: ssh_keys is undefined
 
 - name: Merge sysctl variable
   merge_vars:
-    suffix_to_merge: sysctl__to_merge
+    suffix_to_merge: __sysctl__to_merge
     merged_var_name: sysctl
     expected_type: dict
 
 - name: Merge rclocal variable
   merge_vars:
-    suffix_to_merge: rclocal__to_merge
+    suffix_to_merge: __rclocal__to_merge
     merged_var_name: rclocal
     expected_type: list
 
 - name: "Merge channel_assignments variables"
   merge_vars:
-    suffix_to_merge: "{{ item.split('__')[1] + '__to_merge' }}"
+    suffix_to_merge: "__{{ item.split('__')[1] + '__to_merge' }}"
     merged_var_name: "{{ item.split('__')[1] }}"
     expected_type: dict
   loop: "{{ hostvars[inventory_hostname] | select('match', '.*__channel_assignments_.*') }}"