.

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 379ce7a19af1078f7aeb8ea3626ec190
+md5sum = 4b4a98926eca7b8b0583de7b4c02802e
 
 [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 = 02e96937dd589557aaff25b0f0af5b8e
+md5sum = afabb13c4bf9bbeb35f011e7f9241400
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg

software/ors-amarisoft/instance.cfg

@@ -265,6 +265,8 @@ extra-context =
     raw lopcomm_rrh_supervision_template   ${lopcomm-rrh-supervision.jinja2.py:target}
     raw ru_lopcomm_CreateProcessingEle_template   ${ru_lopcomm_CreateProcessingEle.jinja2.xml:target}
     raw ru_lopcomm_cu_config_template   ${ru_lopcomm_cu_config.jinja2.xml:target}
+    raw ru_lopcomm_firmware_path ${ru_lopcomm_firmware-dl:target}
+    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}

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

@@ -19,7 +19,7 @@ recipe = slapos.recipe.build:download
 url = https://lab.nexedi.com/nexedi/ors-utils/raw/master/lopcomm-firmware/${:filename}
 filename = PR.PRM61C70V1004.002.tar.gz
 md5sum = 4e06fd62968f9f53fd819ef8d880a8f4
-destination = ${directory:etc}/${:filename}
+#destination = ${directory:etc}/${:filename}
 
 [ru_lopcomm_ncclient_common.py]
 <= download-base

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

@@ -20,7 +20,7 @@ extensions = jinja2.ext.do
 _logbase = ${directory:var}/log/{{ru_ref}}-software
 log-output = ${:_logbase}.log
 software-reply-json-log-output = ${:_logbase}-reply.json.log
-remote-file-path = sftp://${user-info:pw-name}@[${slap-configuration:ipv6-random}]:${sshd-port:port}${ru_lopcomm_firmware-dl:destination}
+remote-file-path = sftp://${user-info:pw-name}@[${slap-configuration:ipv6-random}]:${sshd-port:port}{{ru_lopcomm_firmware_path}}
 is_firmware_updated = ${directory:etc}/{{ru_ref}}.is_firmware_updated
 context =
   section directory directory
@@ -33,7 +33,7 @@ context =
   raw python_path {{ buildout_directory}}/bin/pythonwitheggs
   raw buildout_directory_path {{ buildout_directory }}
   key is_firmware_updated :is_firmware_updated
-  raw firmware_name ${ru_lopcomm_firmware-dl:filename}
+  raw firmware_name {{ru_lopcomm_firmware_filename}}
   import netaddr netaddr
 mode = 0775
 url = {{ ru_lopcomm_software_template }}