.

software/ors-amarisoft/config/dnsmasq-core-network.jinja2.cfg

+interface={{ slap_configuration.get('tun-name', '') }}
+port=5353
+{%- set filtered_slave_instance_list = [] %}
+{%- for slave_instance in slap_configuration.get('slave-instance-list', []) %}
+{%-   if slave_instance.get('_', '') != '' %}
+{%-     set slave = json_module.loads(slave_instance.pop('_')) %}
+{%-   else %}
+{%-     set slave = slave_instance %}
+{%-   endif %}
+{%-   if slave.get('subdomain', '') != '' %}
+{%-     do filtered_slave_instance_list.append(slave) %}
+{%-   endif %}
+{%- endfor %}
+
+{% for i, slave in enumerate(filtered_slave_instance_list) -%}
+address=/{{ slave['subdomain'] }}.{{ slap_configuration['configuration'].get('local_domain', '') }}/{{ slave.get('ip', '') }}
+{% endfor -%}

software/ors-amarisoft/config/dnsmasq.jinja2.cfg → software/ors-amarisoft/config/dnsmasq-enb.jinja2.cfg

-{# if dnsmasq_mode == "enb" #}
 dhcp-leasefile={{ directory['etc'] }}/dnsmasq.leases
 port=5354
 dhcp-range=::1,::1,constructor:{{ ru.cpri_link._tap }},ra-names,64,5m
@@ -15,22 +14,3 @@ ra-param=adv-send-advert
 ra-param=adv-managed-flag
 ra-param=adv-other-config-flag
 ra-param=adv-autonomous
-{% else %}
-interface={{ slap_configuration.get('tun-name', '') }}
-port=5353
-{%- set filtered_slave_instance_list = [] %}
-{%- for slave_instance in slap_configuration.get('slave-instance-list', []) %}
-{%-   if slave_instance.get('_', '') != '' %}
-{%-     set slave = json_module.loads(slave_instance.pop('_')) %}
-{%-   else %}
-{%-     set slave = slave_instance %}
-{%-   endif %}
-{%-   if slave.get('subdomain', '') != '' %}
-{%-     do filtered_slave_instance_list.append(slave) %}
-{%-   endif %}
-{%- endfor %}
-
-{% for i, slave in enumerate(filtered_slave_instance_list) -%}
-address=/{{ slave['subdomain'] }}.{{ slap_configuration['configuration'].get('local_domain', '') }}/{{ slave.get('ip', '') }}
-{% endfor -%}
-{% endif %}