.

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = f12829d9c2adbf661e7d14b66798f679
+md5sum = 2922f6c23062b2a6858a12a9f453eacf
 
 [amari_lte.jinja2]
 _update_hash_filename_ = amari/lte.jinja2
@@ -36,7 +36,7 @@ md5sum = e27ebe0ff200a3e4492412f164ca9b73
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = 86aa3cfe980da348bd9c5be387189414
+md5sum = 3314e80281f83222a183f67eef208b9a
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
@@ -64,7 +64,7 @@ md5sum = f2f550b68c8ab243ce1a4bb73a9abc1c
 
 [ru_lopcomm-software.jinja2.py]
 _update_hash_filename_ = ru/lopcomm/software.jinja2.py
-md5sum = 637b678939b8c62c66485473eb61356f
+md5sum = 1cb238147b57241343a1e224f990265b
 
 [lopcomm-rrh-supervision.jinja2.py]
 _update_hash_filename_ = lopcomm-rrh-supervision.jinja2.py
@@ -72,7 +72,7 @@ md5sum = e22257ef526b0acc10a8203daa41028b
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 2061034511f56fcf4fdb29f04967be4c
+md5sum = c5fcc1501225f59dffd19e48ef555144
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg

software/ors-amarisoft/instance.cfg

@@ -244,6 +244,7 @@ extra-context =
 url = ${template-enb:target}
 filename = instance-enb.cfg
 extensions = jinja2.ext.do
+# XXX move RU-specific bits from extra context to ru/...
 extra-context =
     raw monitor_template ${monitor2-template:output}
     section ors_version ors-version
@@ -260,7 +261,7 @@ extra-context =
     raw amarisoft_rf_info_template   ${amarisoft-rf-info.jinja2.py:target}
     raw ru_lopcomm_stats_template   ${ru_lopcomm_stats.jinja2.py:target}
     raw lopcomm_rrh_config_template   ${lopcomm-rrh-config.jinja2.py:target}
-    raw lopcomm_rrh_software_template   ${lopcomm-rrh-software.jinja2.py:target}
+    raw ru_lopcomm_software_template   ${ru_lopcomm-software.jinja2.py:target}
     raw lopcomm_rrh_supervision_template   ${lopcomm-rrh-supervision.jinja2.py:target}
     raw CreateProcessingEle_template   ${CreateProcessingEle.jinja2.xml:target}
     raw cu_config_template   ${cu_config.jinja2.xml:target}

software/ors-amarisoft/ru/lopcomm/buildout.cfg

@@ -4,6 +4,9 @@
 [ru_lopcomm_stats.jinja2.py]
 <= download-base
 
+[ru_lopcomm-software.jinja2.py]
+<= download-base
+
 [ru_lopcomm-firmware-dl]
 recipe = slapos.recipe.build:download
 url = https://lab.nexedi.com/nexedi/ors-utils/raw/master/lopcomm-firmware/${:filename}

software/ors-amarisoft/software-base.cfg

@@ -74,9 +74,6 @@ destination = ${buildout:directory}/ncclient_common.py
 [lopcomm-rrh-config.jinja2.py]
 <= download-base
 
-[lopcomm-rrh-software.jinja2.py]
-<= download-base
-
 [lopcomm-rrh-supervision.jinja2.py]
 <= download-base