Commit ddd14a3a authored by Alain Takoudjou's avatar Alain Takoudjou

Upgrade BOINC, Condor, Redis and BonjourGrid SR

parent 3a379207
......@@ -74,7 +74,7 @@ setup(name=name,
'apacheperl = slapos.recipe.apacheperl:Recipe',
'apachephp = slapos.recipe.apachephp:Recipe',
'apacheproxy = slapos.recipe.apacheproxy:Recipe',
'boinc = slapos.recipe.boinc:Recipe',
'boinc = slapos.recipe.boinc:Recipe',
'boinc.app = slapos.recipe.boinc:App',
'boinc.client = slapos.recipe.boinc:Client',
'bonjourgrid = slapos.recipe.bonjourgrid:Recipe',
......@@ -86,7 +86,7 @@ setup(name=name,
'check_url_available = slapos.recipe.check_url_available:Recipe',
'cloud9 = slapos.recipe.cloud9:Recipe',
'cloudooo.test = slapos.recipe.erp5_test:CloudoooRecipe',
'condor = slapos.recipe.condor:Recipe',
'condor = slapos.recipe.condor:Recipe',
'condor.submit = slapos.recipe.condor:AppSubmit',
'cron = slapos.recipe.dcron:Recipe',
'cron.d = slapos.recipe.dcron:Part',
......
......@@ -48,8 +48,8 @@ wrapper = $${basedirectory:services}/bonjourGrid-Worker
log_file = $${basedirectory:log}/bonjourgrid-worker.log
pid_file = $${basedirectory:run}/bonjourgrid-worker.pid
python-bin = ${buildout:executable}
redis-url = $${slap-parameter:server-url}
redis-port = $${slap-parameter:server-port}
redis-url = $${slap-parameter:redis-ip}
redis-port = $${slap-parameter:redis-port}
#Boinc and Condor parameters
ipv6 = $${slap-network-information:global-ipv6}
......@@ -75,5 +75,5 @@ boinc-account-passwd = $${account-passwd:passwd}
[slap-parameter]
user-email = your.email@your.domain.com
full-name = Your Full Name
server-url =
server-port = 6379
\ No newline at end of file
redis-ip =
redis-port = 6379
\ No newline at end of file
......@@ -28,7 +28,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/bonjourgrid-instance.cfg
output = ${buildout:directory}/template-bonjourgrid.cfg
mode = 0644
md5sum = 59b55246b2813bc162f528734132df02
md5sum = 79906aff35d05227d177a7e18880e3c0
[bonjourgrid]
recipe = hexagonit.recipe.download
......@@ -38,7 +38,7 @@ md5sum = 50f6da04e9cd203a886a9cb4658f8e03
[computer-info]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/templates/machineinfo.worker.sh.in
md5sum = 630303e64d98a9af31be7e9f8c0d91b6
md5sum = 3fd602fdf8a4fd30a247752c7c03031a
filename = machineinfo.worker.sh.in
download-only = true
......
#!/bin/sh
# This script generates a file (with the name `hostname`) of the characteristics of the machine
Mhz=`grep -i Mhz /proc/cpuinfo | cut -d : -f2 | head -1 | cut -f2 -d " "`
mem=`grep -i MemTotal /proc/meminfo | cut -f2 -d :`
Ram=`echo $mem | cut -f1 -d " "`
Cpu=`uname -a | cut -f3 -d " "`
H=`hostname`
Nbproc=`grep processor /proc/cpuinfo |wc -l`
Ip=${:ip_address}
c="{'"MHZ"':\"$Mhz\",'"Ram"':\"$Ram\",'"Cpu"':\"$Cpu\",'"HOST"':\"$H\",'"IP"':\"$Ip\"}"
filename=`hostname`
echo $c > $filename
#!/bin/sh
# This script generates a file (with the name `hostname`) of the characteristics of the machine
Mhz=`grep -i Mhz /proc/cpuinfo | cut -d : -f2 | head -1 | cut -f2 -d " "`
mem=`grep -i MemTotal /proc/meminfo | cut -f2 -d :`
Ram=`echo $mem | cut -f1 -d " "`
Cpu=`uname -a | cut -f3 -d " "`
H=`hostname`
Nbproc=`grep processor /proc/cpuinfo |wc -l`
Ip=${:ip_address}
c="{'"MHZ"':\"$Mhz\",'"Ram"':\"$Ram\",'"Cpu"':\"$Cpu\",'"HOST"':\"$H\",'"IP"':\"$Ip\"}"
filename=`hostname`
echo $c > $filename
......@@ -71,5 +71,5 @@ server-port = $${redis:port}
server-password = $${redis:passwd}
worker-number = 1
#specified if we want to run BOINC or Condor project:
#project-type = boinc | condor | both
#project-type = boinc | condor
project-type = boinc
\ No newline at end of file
......@@ -19,7 +19,8 @@ bin = $${buildout:directory}/bin/
[basedirectory]
recipe = slapos.cookbook:mkdirectory
services = $${rootdirectory:etc}/run/
scripts = $${rootdirectory:etc}/run/
services = $${rootdirectory:etc}/service/
run = $${rootdirectory:var}/run/
log = $${rootdirectory:var}/log/
......@@ -44,10 +45,10 @@ wrapper = $${basedirectory:services}/redis_server
# Send informations to SlapOS Master
[publish-connection-informations]
recipe = slapos.cookbook:publish
redis_url = $${redis:ipv6}
redis_ip = $${redis:ipv6}
redis_port = $${redis:port}
redis_passwd = $${redis:passwd}
redis_password = $${redis:use_passwd}
redis_uses_password = $${redis:use_passwd}
[slap-parameter]
use_passwd = false
\ No newline at end of file
......@@ -37,7 +37,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-bonjourgrid.cfg
output = ${buildout:directory}/template-bonjourgrid.cfg
mode = 0644
md5sum = c1334a8564d5ddbd6f18e06995d8f5ca
md5sum = 16e6f827c1fcc2a62ab8eaea167bf937
[bonjourgrid]
recipe = hexagonit.recipe.download
......@@ -49,7 +49,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-redis.cfg
output = ${buildout:directory}/template-redis.cfg
mode = 0644
md5sum = d46047a3b6285b12843572b8101e955a
md5sum = 8b223d1fe0ffd40c7151766730da7fcb
[boinc-instance]
recipe = slapos.recipe.template
......
......@@ -19,6 +19,7 @@ bin = $${buildout:directory}/bin/
[basedirectory]
recipe = slapos.cookbook:mkdirectory
scripts = $${rootdirectory:etc}/run/
services = $${rootdirectory:etc}/service/
run = $${rootdirectory:var}/run/
log = $${rootdirectory:var}/log/
......@@ -44,10 +45,10 @@ wrapper = $${basedirectory:services}/redis_server
# Send informations to SlapOS Master
[publish-connection-informations]
recipe = slapos.cookbook:publish
server_url = $${redis:ipv6}
port = $${redis:port}
passwd = $${redis:passwd}
use_master_password = $${redis:use_passwd}
redis_ip = $${redis:ipv6}
redis_port = $${redis:port}
redis_passwd = $${redis:passwd}
redis_uses_password = $${redis:use_passwd}
[slap-parameter]
use_passwd = false
\ No newline at end of file
......@@ -29,7 +29,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-redis.cfg
output = ${buildout:directory}/template-redis.cfg
mode = 0644
md5sum = 438ef8177854f78055218413d468b065
md5sum = 8b223d1fe0ffd40c7151766730da7fcb
# Local development
[slapos.cookbook-repository]
......
......@@ -34,7 +34,7 @@ eggs =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-boinc.cfg
output = ${buildout:directory}/template-boinc.cfg
md5sum = d93a345e9f1aa1e299105437f71189f9
md5sum = 004691e9194eca2fa9cb1033094d3738
mode = 0644
#Template for deploying MySQL Database Server
......@@ -42,7 +42,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-mariadb.cfg
output = ${buildout:directory}/template-mariadb.cfg
md5sum = f355b0b29901a0e8b5e173e0cfa24326
md5sum = 8142244a3087a23e002a08225579528a
mode = 0644
[template-httpd-conf]
......
......@@ -38,7 +38,8 @@ project = $${buildout:directory}/projects/
[basedirectory]
recipe = slapos.cookbook:mkdirectory
log = $${rootdirectory:var}/log/
services = $${rootdirectory:etc}/run/
services = $${rootdirectory:etc}/service/
scripts = $${rootdirectory:etc}/run/
run = $${rootdirectory:var}/run/
backup = $${rootdirectory:srv}/backup/
promises = $${rootdirectory:etc}/promise/
......@@ -189,7 +190,7 @@ fullname = $${slap-parameter:full-name}
copyright = $${slap-parameter:copyright-holder}
boinc = ${boinc:location}
installroot = $${rootdirectory:project}/$${slap-parameter:project}
wrapper-dir = $${basedirectory:services}
wrapper-dir = $${basedirectory:scripts}
source = ${boinc:source}
passwd = $${boinc-passwd:storage-path}
#Manualy add develop-egg and boinc-egg to pythonpath
......@@ -318,7 +319,7 @@ pid-file = $${basedirectory:run}/apache.pid
database-path = $${basedirectory:log}/slapmonitor.db
shell-path = ${dash:location}/bin/dash
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:services}/slapmonitor
path = $${basedirectory:scripts}/slapmonitor
[slapreport]
recipe = slapos.cookbook:slapreport
......@@ -331,7 +332,7 @@ logbox-user = admin
logbox-passwd = passer
shell-path = ${dash:location}/bin/dash
slapreport-path = ${buildout:bin-directory}/slapreport
path = $${basedirectory:services}/slapreport
path = $${basedirectory:scripts}/slapreport
# Publish all instance parameters (url of instance)
......
......@@ -30,7 +30,8 @@ bin = $${buildout:directory}/bin/
[basedirectory]
recipe = slapos.cookbook:mkdirectory
log = $${rootdirectory:var}/log/
services = $${rootdirectory:etc}/run/
scripts = $${rootdirectory:etc}/run/
services = $${rootdirectory:etc}/service/
run = $${rootdirectory:var}/run/
backup = $${rootdirectory:srv}/backup/
promises = $${rootdirectory:etc}/promise/
......@@ -62,7 +63,7 @@ database = boincdb
# Paths
wrapper = $${basedirectory:services}/mariadb
update-wrapper = $${basedirectory:services}/mariadb_update
update-wrapper = $${basedirectory:scripts}/mariadb_update
logrotate-post = $${rootdirectory:bin}/mariadb_post_logrotate
data-directory = $${directory:mariadb-data}
pid-file = $${basedirectory:run}/mariadb.pid
......@@ -84,7 +85,7 @@ pid-file = $${basedirectory:run}/mariadb.pid
database-path = $${basedirectory:log}/slapmonitor.db
shell-path = ${dash:location}/bin/dash
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:services}/slapmonitor
path = $${basedirectory:scripts}/slapmonitor
[slapreport]
recipe = slapos.cookbook:slapreport
......@@ -97,7 +98,7 @@ logbox-user = admin
logbox-passwd = passer
shell-path = ${dash:location}/bin/dash
slapreport-path = ${buildout:bin-directory}/slapreport
path = $${basedirectory:services}/slapreport
path = $${basedirectory:scripts}/slapreport
[certificate-authority]
recipe = slapos.cookbook:certificate_authority
......
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