Commit d817f62c authored by Łukasz Nowak's avatar Łukasz Nowak

Use slapos provided networkcached buildout.

As older versions of slapos.core will ignore slapos:buildout switch it is safe
to direct them to unexisting one.

New slapos profiles are generating buildout_networkache in self location, so as
already all parameters are hardocded, use such path directly.
parent b6b47196
...@@ -177,7 +177,9 @@ def run(config): ...@@ -177,7 +177,9 @@ def run(config):
'template/slapos.cfg.in').read() % dict( 'template/slapos.cfg.in').read() % dict(
computer_id=config.computer_id, master_url=config.master_url, computer_id=config.computer_id, master_url=config.master_url,
key_file=key_file, cert_file=cert_file, key_file=key_file, cert_file=cert_file,
certificate_repository_path=certificate_repository_path certificate_repository_path=certificate_repository_path,
buildout=os.path.join('/opt', 'slapos', 'bin',
'buildout_networkache')
)) ))
hostname_path = os.path.normpath('/'.join([mount_dir_path, hostname_path = os.path.normpath('/'.join([mount_dir_path,
......
...@@ -6,6 +6,7 @@ computer_id = %(computer_id)s ...@@ -6,6 +6,7 @@ computer_id = %(computer_id)s
key_file = %(key_file)s key_file = %(key_file)s
cert_file = %(cert_file)s cert_file = %(cert_file)s
certificate_repository_path = %(certificate_repository_path)s certificate_repository_path = %(certificate_repository_path)s
buildout = %(buildout_path)
[slapformat] [slapformat]
computer_xml = /opt/slapos/slapos.xml computer_xml = /opt/slapos/slapos.xml
......
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