.

software/ors-amarisoft/buildout.hash.cfg

@@ -16,11 +16,11 @@
 
 [template]
 filename = instance.cfg
-md5sum = 22afd27ef30ca963db84088a2a904ba9
+md5sum = ee41fc926b822aaef7c8337a3538c6d8
 
 [template-ors]
 filename = instance-ors.cfg
-md5sum = ba42b80cb9aeb38aeedeeb49553c8bbb
+md5sum = fbe24662d869f506f66ab7911dfa0f91
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2

software/ors-amarisoft/instance-ors.cfg

@@ -20,6 +20,29 @@ extensions = jinja2.ext.do
 extra-context =
     key slave_instance_list slap-configuration:slave-instance-list
 
+# XXX adapt to ors
+[dynamic-template-gnb]
+< = jinja2-template-base
+url = ${template-gnb:target}
+filename = instance-gnb.cfg
+extensions = jinja2.ext.do
+extra-context =
+    raw monitor_template ${monitor2-template:output}
+    section ors_version ors-version
+    section comp_id comp-id
+    key lte_version amarisoft:lte-version
+    key lte_expiration amarisoft:lte-expiration
+    key enb amarisoft:enb
+    key sdr amarisoft:sdr
+    raw gnb_template   ${gnb.jinja2.cfg:target}
+    raw amarisoft_stats_template   ${amarisoft-stats.jinja2.py:target}
+    raw amarisoft_rf_info_template   ${amarisoft-rf-info.jinja2.py:target}
+    raw openssl_location ${openssl:location}
+    raw default_nr_inactivity_timer ${default-params:default-nr-inactivity-timer}
+    raw python_path ${python3:location}
+    raw fluent_bit_location ${fluent-bit:location}
+
+
 [ors-version]
 recipe = slapos.recipe.build
 configuration = $${slap-configuration:configuration}

software/ors-amarisoft/instance.cfg

@@ -165,28 +165,6 @@ extra-context =
     raw openssh_location ${openssh:location}
     raw openssh_output_keygen ${openssh-output:keygen}
 
-# XXX kill
-[dynamic-template-gnb]
-< = jinja2-template-base
-url = ${template-gnb:target}
-filename = instance-gnb.cfg
-extensions = jinja2.ext.do
-extra-context =
-    raw monitor_template ${monitor2-template:output}
-    section ors_version ors-version
-    section comp_id comp-id
-    key lte_version amarisoft:lte-version
-    key lte_expiration amarisoft:lte-expiration
-    key enb amarisoft:enb
-    key sdr amarisoft:sdr
-    raw gnb_template   ${gnb.jinja2.cfg:target}
-    raw amarisoft_stats_template   ${amarisoft-stats.jinja2.py:target}
-    raw amarisoft_rf_info_template   ${amarisoft-rf-info.jinja2.py:target}
-    raw openssl_location ${openssl:location}
-    raw default_nr_inactivity_timer ${default-params:default-nr-inactivity-timer}
-    raw python_path ${python3:location}
-    raw fluent_bit_location ${fluent-bit:location}
-
 [dynamic-template-core-network]
 < = jinja2-template-base
 url = ${template-core-network:target}