Commit 41cbe596 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

Fix upload command after new release of slapos.libnetworkcache

See nexedi/slapos.libnetworkcache@0fe8148a

slapos.libnetworkcache now needs the signature key to have a
corresponding certificate in signature-certificate-list so we need to
give signature_certificate_list to NetworkCacheClient constructor.
parent 33458fc0
......@@ -372,6 +372,7 @@ class Software(object):
self.upload_binary_dir_url,
tarpath, self.logger,
self.signature_private_key_file,
self.signature_certificate_list,
self.shacache_ca_file,
self.shacache_cert_file,
self.shacache_key_file,
......
......@@ -138,8 +138,8 @@ def download_network_cached(cache_url, dir_url, software_url, software_root,
@fallback_call
def upload_network_cached(software_root, software_url, cached_key,
cache_url, dir_url, path, logger, signature_private_key_file,
shacache_ca_file, shacache_cert_file, shacache_key_file,
shadir_ca_file, shadir_cert_file, shadir_key_file):
signature_certificate_list, shacache_ca_file, shacache_cert_file,
shacache_key_file, shadir_ca_file, shadir_cert_file, shadir_key_file):
"""Upload file to a network cache server"""
if not LIBNETWORKCACHE_ENABLED:
return False
......@@ -179,6 +179,7 @@ def upload_network_cached(software_root, software_url, cached_key,
try:
nc = NetworkcacheClient(cache_url, dir_url,
signature_private_key_file=signature_private_key_file,
signature_certificate_list=signature_certificate_list,
shacache_ca_file=shacache_ca_file,
shacache_cert_file=shacache_cert_file,
shacache_key_file=shacache_key_file,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment