.

software/ors-amarisoft/instance-core-network.jinja2.cfg

@@ -221,15 +221,28 @@ url = {{ mme_template }}
 output = ${directory:etc}/mme.cfg
 
 {% if slapparameter_dict.get("local_domain", '') %}
+[dnsmasq-config]
+recipe = slapos.recipe.template:jinja2
+url = {{dnsmasq_template}}
+filename = dnsmasq.cfg
+extensions = jinja2.ext.do
+output = ${directory:etc}/${:filename}
+context =
+    import json_module json
+    import netaddr netaddr
+    section directory directory
+    section slap_configuration slap-configuration
+    key slapparameter_dict slap-configuration:configuration
+
 [dnsmasq-service]
 recipe = slapos.cookbook:wrapper
 port = 5353
 ip = ${slap-configuration:tun-ipv4-addr}
-command-line = {{ dnsmasq_location }}/sbin/dnsmasq --conf-file={{ dnsmasq_config_path }} -x ${directory:run}/dnsmasq.pid --local-service --keep-in-foreground
+command-line = {{ dnsmasq_location }}/sbin/dnsmasq --conf-file=${dnsmasq-config:output}} -x ${directory:run}/dnsmasq.pid --local-service --keep-in-foreground
 wrapper-path = ${directory:service}/dnsmasq
 mode = 0775
 hash-files =
-  {{ dnsmasq_config_path }}
+  ${dnsmasq-config:output}
 
 #[dnsmasq-listen-promise]
 #<= monitor-promise-base

software/ors-amarisoft/instance.cfg

@@ -298,9 +298,8 @@ extra-context =
     raw ru_lopcomm_firmware_filename ${ru_lopcomm_firmware-dl:filename}
     raw openssl_location ${openssl:location}
     raw default_lte_inactivity_timer ${default-params:default-lte-inactivity-timer}
-    raw dnsmasq_template   ${dnsmasq.jinja2.cfg:target}
+    raw dnsmasq_template   ${dnsmasq-enb.jinja2.cfg:target}
     raw dnsmasq_location ${dnsmasq:location}
-    key dnsmasq_config_path dnsmasq-config:output
     raw fluent_bit_location ${fluent-bit:location}
     raw openssh_location ${openssh:location}
     raw openssh_output_keygen ${openssh-output:keygen}
@@ -334,7 +333,7 @@ extra-context =
     raw monitor_template ${monitor2-template:output}
     key mme amarisoft:mme
     raw mme_template   ${mme.jinja2.cfg:target}
-    raw dnsmasq_template   ${dnsmasq.jinja2.cfg:target}
+    raw dnsmasq_template   ${dnsmasq-core-network.jinja2.cfg:target}
     raw ims_template   ${ims.jinja2.cfg:target}
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw openssl_location ${openssl:location}
@@ -342,7 +341,6 @@ extra-context =
     raw iperf3_location ${iperf3:location}
     raw dnsmasq_location ${dnsmasq:location}
     key ue_db_path ue-db-config:output
-    key dnsmasq_config_path dnsmasq-config:output
     key slave_instance_list slap-configuration:slave-instance-list
 
 [dynamic-template-ue]
@@ -366,17 +364,4 @@ extensions = jinja2.ext.do
 output = $${directory:etc}/$${:filename}
 context =
     import json_module json
-    key slave_instance_list slap-configuration:slave-instance-list
 
-[dnsmasq-config]
-recipe = slapos.recipe.template:jinja2
-url = ${dnsmasq.jinja2.cfg:target}
-filename = dnsmasq.cfg
-extensions = jinja2.ext.do
-output = $${directory:etc}/$${:filename}
-context =
-    import json_module json
-    import netaddr netaddr
-    section directory directory
-    section slap_configuration slap-configuration
-    key slapparameter_dict slap-configuration:configuration