Commit b9f401ba authored by Rafael Monnerat's avatar Rafael Monnerat

[shared]: Rename slapos_recipe_cmmi_shared_path into shared_software_root

 We would like to produce a more genetic API so we rename it to a name with a wider scope.
parent 43f10015
......@@ -8,7 +8,7 @@ cert_file = /etc/opt/slapos/ssl/computer.crt
certificate_repository_path = /etc/opt/slapos/ssl/partition_pki
software_root = /opt/slapgrid
instance_root = /srv/slapgrid
slapos_recipe_cmmi_shared_path = /opt/slapgrid/shared
shared_software_root = /opt/slapgrid/shared
[slapformat]
# Replace by your network interface providing IPv6 if you don't use re6st
......
......@@ -110,7 +110,7 @@ class Software(object):
download_from_binary_cache_url_blacklist=None,
upload_to_binary_cache_url_blacklist=None,
software_min_free_space=None,
slapos_recipe_cmmi_shared_path=None):
shared_software_root=None):
"""Initialisation of class parameters
"""
......@@ -125,7 +125,7 @@ class Software(object):
self.software_url_hash = md5digest(self.url)
self.software_path = os.path.join(self.software_root,
self.software_url_hash)
self.slapos_recipe_cmmi_shared_path = slapos_recipe_cmmi_shared_path
self.shared_software_root = shared_software_root
self.buildout = buildout
self.logger = logger
self.signature_private_key_file = signature_private_key_file
......@@ -260,9 +260,9 @@ class Software(object):
additional_parameters = list(self._additional_buildout_parameters(extends_cache))
additional_parameters.extend(['-c', buildout_cfg])
if self.slapos_recipe_cmmi_shared_path:
additional_parameters.append('buildout:slapos-recipe-cmmi-shared-path=%s' %
self.slapos_recipe_cmmi_shared_path)
if self.shared_software_root:
additional_parameters.append('buildout:shared-software-root=%s' %
self.shared_software_root)
utils.bootstrapBuildout(path=self.software_path,
buildout=self.buildout,
......
......@@ -557,7 +557,7 @@ stderr_logfile_backups=1
shadir_cert_file=self.shadir_cert_file,
shadir_key_file=self.shadir_key_file,
software_min_free_space=self.software_min_free_space,
slapos_recipe_cmmi_shared_path=self.config.get('slapos_recipe_cmmi_shared_path'),)
shared_software_root=self.config.get('shared_software_root'),)
# call manager for every software release
for manager in self._manager_list:
......
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