diff --git a/software/slaprunner/TODO.txt b/software/slaprunner/TODO.txt index 020f67742700ce0e32d5240c78bf7117111b1ebe..613819fda066b92bfbb0691d272377a28d428d58 100644 --- a/software/slaprunner/TODO.txt +++ b/software/slaprunner/TODO.txt @@ -1,3 +1,4 @@ - resilient sr: Cloned instances should not launch slapgrid-sr if it was not launched on export instance - shellinabox password should be the same in all the resilient instances - add test for parameter auto-deploy-instance +- Add download facility in file browser diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg index 45f7c7710a9e9dae5d14e2858a889193dbd89dcc..a39c671b22d0371d4bc6d6837439cbc6639108de 100644 --- a/software/slaprunner/common.cfg +++ b/software/slaprunner/common.cfg @@ -43,7 +43,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-runner.cfg output = ${buildout:directory}/template-runner.cfg.in -md5sum = a1987b36e64cc021cb0cee47eee7dde2 +md5sum = 403074d7563ff122fa9a5b29ec4ba8a8 mode = 0644 [template-runner-import-script] @@ -214,7 +214,3 @@ recipe = zc.recipe.egg interpreter = pythonwitheggs eggs += supervisor - -[versions] -# We still need to use the older version. -slapos.core = 1.0.5 diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg index 74dacb05b8eddd7ac2e7a320acdc0e5e003be857..0d66438b7b4d1cadcdc35e4898c323d80db750d5 100644 --- a/software/slaprunner/instance-runner.cfg +++ b/software/slaprunner/instance-runner.cfg @@ -208,7 +208,7 @@ auto_deploy = True recipe = slapos.cookbook:wrapper command-line = ${buildout:directory}/bin/slaprunnertest wrapper-path = $${directory:bin}/runTestSuite -environment = RUNNER_CONFIG=$${slapos-test-cfg:rendered} +environment = RUNNER_CONFIG=$${slapos-cfg:rendered} # Deploy dropbear (minimalist SSH server) [sshkeys-directory] @@ -644,12 +644,12 @@ pidfile = $${directory:run}/supervisord.pid server = $${slaprunner:ipv4}:$${:port} port = 39986 slapgrid-cp = slapgrid-cp -slapgrid-cp-command = $${slaprunner:slapos} node instance --all --cfg $${slaprunner:slapos.cfg} --pidfile $${:slapgrid-cp-pid} --verbose --logfile $${:slapgrid-cp-log} +slapgrid-cp-command = $${slaprunner:slapos} node instance --all --cfg $${:slapos-cfg} --pidfile $${:slapgrid-cp-pid} --verbose --logfile $${:slapgrid-cp-log} slapgrid-cp-log = $${runnerdirectory:home}/instance.log slapgrid-cp-pid = $${directory:run}/slapgrid-cp.pid slapgrid-cp-startretries = 0 slapgrid-sr = slapgrid-sr -slapgrid-sr-command = $${slaprunner:slapos} node software --all --cfg $${slaprunner:slapos.cfg} --pidfile $${:slapgrid-sr-pid} --verbose --logfile $${:slapgrid-sr-log} +slapgrid-sr-command = $${slaprunner:slapos} node software --all --cfg $${:slapos-cfg} --pidfile $${:slapgrid-sr-pid} --verbose --logfile $${:slapgrid-sr-log} slapgrid-sr-log = $${runnerdirectory:home}/software.log slapgrid-sr-pid = $${directory:run}/slapgrid-sr.pid slapgrid-sr-startretries = 0 @@ -657,7 +657,7 @@ slapproxy = slapproxy slapproxy-autorestart = true slapproxy-autostart = true slapproxy-startsecs = 1 -slapproxy-command = $${slaprunner:slapos} proxy start --logfile $${:slapproxy-log} --cfg $${slaprunner:slapos.cfg} +slapproxy-command = $${slaprunner:slapos} proxy start --logfile $${:slapproxy-log} --cfg $${:slapos-cfg} slapproxy-log = $${directory:log}/slapproxy.log socket_name = unix://$${:socket_path} socket_path = $${directory:tmp}/supervisord.sock @@ -665,6 +665,7 @@ startsecs = 0 # This file logs errors from listeners. Supervisord has its own logfile. # Processes should handle their logs by themselves stderr_logfile = $${directory:log}/supervisord-errors.log +slapos-cfg = $${slaprunner:slapos.cfg} [supervisord-conf] recipe = slapos.recipe.template:jinja2 diff --git a/software/slaprunner/software.cfg b/software/slaprunner/software.cfg index 099017e8944b8ba58d313daae861a01a2ad7c2ab..f7b2e61624727ae95c0158edb1ed161adc9c8f3e 100644 --- a/software/slaprunner/software.cfg +++ b/software/slaprunner/software.cfg @@ -27,11 +27,11 @@ smmap = 0.8.2 z3c.recipe.scripts = 1.0.1 # Required by: -# slapos.toolbox==0.39.3 +# slapos.toolbox==0.40.1 GitPython = 0.3.2.RC1 # Required by: -# slapos.toolbox==0.39.3 +# slapos.toolbox==0.40.1 atomize = 0.2.0 # Required by: @@ -39,9 +39,9 @@ atomize = 0.2.0 ecdsa = 0.11 # Required by: -# slapos.toolbox==0.39.3 +# slapos.toolbox==0.40.1 feedparser = 5.1.3 # Required by: -# slapos.toolbox==0.39.3 -paramiko = 1.14.1 +# slapos.toolbox==0.40.1 +paramiko = 1.14.1 \ No newline at end of file