.

software/ors-amarisoft/buildout.hash.cfg

@@ -36,7 +36,7 @@ md5sum = e27ebe0ff200a3e4492412f164ca9b73
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = f6a32c5c002021e13bf73bd67bae4fe4
+md5sum = 1b2d7ced1679862b8cb84a37a60b5df7
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
@@ -72,7 +72,7 @@ md5sum = e22257ef526b0acc10a8203daa41028b
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 8417ee8038ef11e00a1e7733fc4e852a
+md5sum = 70054f6abcea11ff71e46479d32ece56
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg

software/ors-amarisoft/instance-enb.jinja2.cfg

@@ -260,26 +260,6 @@ mode = 0775
 url = {{ amarisoft_rf_info_template }}
 output = ${directory:bin}/amarisoft-rf-info.py
 
-# XXX -> ru/lopcomm
-[lopcomm-rrh-config-template]
-recipe = slapos.recipe.template:jinja2
-extensions = jinja2.ext.do
-log-output = ${directory:var}/log/lopcomm-rrh-config.log
-context =
-  section directory directory
-  section slap_configuration slap-configuration
-  key slapparameter_dict slap-configuration:configuration
-  key log_file :log-output
-  raw testing {{ slapparameter_dict.get("testing", False) }}
-  raw python_path {{ buildout_directory}}/bin/pythonwitheggs
-  raw buildout_directory_path {{ buildout_directory }}
-  raw ru_lopcomm_CreateProcessingEle_template {{ ru_lopcomm_CreateProcessingEle_template }}
-  key cu_config_template lopcomm-cu-config:output
-  import netaddr netaddr
-mode = 0775
-url = {{ lopcomm_rrh_config_template }}
-output = ${directory:script}/lopcomm-rrh-config.py
-
 [lopcomm-rrh-supervision-template]
 recipe = slapos.recipe.template:jinja2
 extensions = jinja2.ext.do

software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg

@@ -64,6 +64,25 @@ url = {{ ru_lopcomm_cu_config_template }}
 {% endif %}
 output = ${directory:etc}/{{ru_ref}}-cu_config.xml
 
+[{{ru_ref}}-config-template]
+recipe = slapos.recipe.template:jinja2
+extensions = jinja2.ext.do
+log-output = ${directory:var}/log/{{ru_ref}}-config.log
+context =
+  section directory directory
+  section slap_configuration slap-configuration
+  key slapparameter_dict slap-configuration:configuration
+  key log_file :log-output
+  raw testing {{ slapparameter_dict.get("testing", False) }}
+  raw python_path {{ buildout_directory}}/bin/pythonwitheggs
+  raw buildout_directory_path {{ buildout_directory }}
+  raw ru_lopcomm_CreateProcessingEle_template {{ ru_lopcomm_CreateProcessingEle_template }}
+  key cu_config_template {{ru_ref}}-cu-config:output
+  import netaddr netaddr
+mode = 0775
+url = {{ lopcomm_rrh_config_template }}
+output = ${directory:script}/{{ru_ref}}-config.py
+