Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaohe Cao
slapos
Commits
0c4a78e7
Commit
0c4a78e7
authored
Mar 21, 2013
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update BonjourGrid to use new BOINC parameter definition
parent
65ecb29d
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
41 additions
and
93 deletions
+41
-93
software/boinc/boinc-app.cfg
software/boinc/boinc-app.cfg
+0
-42
software/bonjourgrid/boinc-app.cfg
software/bonjourgrid/boinc-app.cfg
+2
-23
software/bonjourgrid/bonjourgrid.src/bonjourgrid.tar.gz
software/bonjourgrid/bonjourgrid.src/bonjourgrid.tar.gz
+0
-0
software/bonjourgrid/instance-bonjourgrid.cfg
software/bonjourgrid/instance-bonjourgrid.cfg
+1
-5
software/bonjourgrid/software.cfg
software/bonjourgrid/software.cfg
+35
-20
stack/boinc/buildout.cfg
stack/boinc/buildout.cfg
+1
-1
stack/boinc/instance-boinc.cfg
stack/boinc/instance-boinc.cfg
+2
-2
No files found.
software/boinc/boinc-app.cfg
deleted
100644 → 0
View file @
65ecb29d
[buildout]
parts =
boinc-server
certificate-authority
ca-stunnel
logrotate
logrotate-entry-apache
logrotate-entry-stunnel
cron
cron-entry-logrotate
cron-entry-boinc
promise
slapmonitor
slapreport
frontend-promise
content-promise
publish-connection-informations
#User application
boinc-app
#slap application
slap-application
extends = ${template-boinc:output}
#Deploy a Boinc application in existing boinc server instance. do the same thing for another boinc app instance
[boinc-app]
<= boinc-server
recipe = slapos.cookbook:boinc.app
binary = ${boinc-application:location}/${boinc-application:filename}
#app-name should be unique (for all app deployed an boinc instance)
app-name = ${boinc-application:app-name}
version = ${boinc-application:version}
platform = ${boinc-application:platform}
extension = ${boinc-application:exec-extension}
#templates
template-result = ${template_result:location}/${template_result:filename}
template-wu = ${template_wu:location}/${template_wu:filename}
#Work Unit
wu-number = ${boinc-application:wu-number}
input-file = ${template_input:location}/${template_input:filename}
software/bonjourgrid/boinc-app.cfg
View file @
0c4a78e7
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
parts =
parts =
boinc-server
boinc-server
boinc-app
certificate-authority
certificate-authority
ca-stunnel
ca-stunnel
logrotate
logrotate
...
@@ -12,14 +13,9 @@ parts =
...
@@ -12,14 +13,9 @@ parts =
cron-entry-boinc
cron-entry-boinc
promise
promise
slapmonitor
slapmonitor
slapreport
frontend-promise
frontend-promise
content-promise
content-promise
publish-connection-informations
publish-connection-informations
#User application
boinc-app
#slap application
slap-application
extends =
extends =
${template-boinc:output}
${template-boinc:output}
...
@@ -33,20 +29,3 @@ boinc = $${rootdirectory:etc}/boinc/
...
@@ -33,20 +29,3 @@ boinc = $${rootdirectory:etc}/boinc/
[boinc-server]
[boinc-server]
wrapper-dir = $${boincdirectory:boinc}
wrapper-dir = $${boincdirectory:boinc}
#Deploy a Boinc application in existing boinc server instance. do the same thing for another boinc app instance
[boinc-app]
<= boinc-server
recipe = slapos.cookbook:boinc.app
binary = ${boinc-application:location}/${boinc-application:filename}
#app-name should be unique (for all app deployed an boinc instance)
app-name = ${boinc-application:app-name}
version = ${boinc-application:version}
platform = ${boinc-application:platform}
extension = ${boinc-application:exec-extension}
#templates
template-result = ${template_result:location}/${template_result:filename}
template-wu = ${template_wu:location}/${template_wu:filename}
#Work Unit
wu-number = ${boinc-application:wu-number}
input-file = ${template_input:location}/${template_input:filename}
software/bonjourgrid/bonjourgrid.src/bonjourgrid.tar.gz
View file @
0c4a78e7
No preview for this file type
software/bonjourgrid/instance-bonjourgrid.cfg
View file @
0c4a78e7
...
@@ -14,14 +14,10 @@ parts =
...
@@ -14,14 +14,10 @@ parts =
cron-entry-boinc
cron-entry-boinc
promise
promise
slapmonitor
slapmonitor
slapreport
frontend-promise
frontend-promise
content-promise
content-promise
publish-connection-informations
publish-connection-informations
#User application
boinc-app
boinc-app
#slap application
slap-application
condor
condor
app-submit
app-submit
...
@@ -57,7 +53,7 @@ redis-passwd = $${slap-parameter:server-password}
...
@@ -57,7 +53,7 @@ redis-passwd = $${slap-parameter:server-password}
type = $${slap-parameter:project-type}
type = $${slap-parameter:project-type}
python-bin = ${buildout:executable}
python-bin = ${buildout:executable}
url-boinc = $${boinc-app:url-base}$${
slap-application
:project}/
url-boinc = $${boinc-app:url-base}$${
boinc-app
:project}/
condor_host = $${slap-parameter:condor_host}
condor_host = $${slap-parameter:condor_host}
ipv6 = $${condor:ip}
ipv6 = $${condor:ip}
...
...
software/bonjourgrid/software.cfg
View file @
0c4a78e7
...
@@ -7,7 +7,7 @@ develop =
...
@@ -7,7 +7,7 @@ develop =
parts =
parts =
boinc-instance
boinc-instance
template
template
boinc-
application
application
template_wu
template_wu
template_result
template_result
template_input
template_input
...
@@ -32,18 +32,31 @@ extends =
...
@@ -32,18 +32,31 @@ extends =
../../stack/slapos.cfg
../../stack/slapos.cfg
#Generate All instances templates
#Generate All instances templates
[template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
md5sum = 2f23572c39bfcedcdebdb5963aeefc38
################################
### BonjourGrid description ####
################################
[bonjourgrid-instance]
[bonjourgrid-instance]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-bonjourgrid.cfg
url = ${:_profile_base_location_}/instance-bonjourgrid.cfg
output = ${buildout:directory}/template-bonjourgrid.cfg
output = ${buildout:directory}/template-bonjourgrid.cfg
mode = 0644
mode = 0644
md5sum =
16e6f827c1fcc2a62ab8eaea167bf937
md5sum =
216b87eb0675cb5f61462d21fff3a392
[bonjourgrid]
[bonjourgrid]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/bonjourgrid.src/bonjourgrid.tar.gz
url = ${:_profile_base_location_}/bonjourgrid.src/bonjourgrid.tar.gz
md5sum =
d67764e80cedb51c6420ae8b711db5db
md5sum =
22925dcf5a8ceb8da449ccf52402a195
#################################
### Redis-Server description ####
#################################
[template-redis]
[template-redis]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-redis.cfg
url = ${:_profile_base_location_}/instance-redis.cfg
...
@@ -51,22 +64,18 @@ output = ${buildout:directory}/template-redis.cfg
...
@@ -51,22 +64,18 @@ output = ${buildout:directory}/template-redis.cfg
mode = 0644
mode = 0644
md5sum = 8b223d1fe0ffd40c7151766730da7fcb
md5sum = 8b223d1fe0ffd40c7151766730da7fcb
#################################
### BOINC Server description ####
#################################
[boinc-instance]
[boinc-instance]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/boinc-app.cfg
url = ${:_profile_base_location_}/boinc-app.cfg
output = ${buildout:directory}/template-boinc-app.cfg
output = ${buildout:directory}/template-boinc-app.cfg
mode = 0644
mode = 0644
md5sum = 6522c134cbdc52daf0f8983a45153100
md5sum = 97bf1a369946b50ae1163e2d83209857
[template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
md5sum = 2f23572c39bfcedcdebdb5963aeefc38
#Download Boinc Application Binary and configure project
#Download Boinc Application Binary and configure project
[
boinc-
application]
[application]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${boinc:location}/libexec/examples/upper_case
url = ${boinc:location}/libexec/examples/upper_case
download-only = true
download-only = true
...
@@ -74,11 +83,6 @@ filename = upper_case
...
@@ -74,11 +83,6 @@ filename = upper_case
#Application configuration
#Application configuration
app-name = upper_case
app-name = upper_case
version = 1.00
version = 1.00
exec-extension =
#Please read Boinc platform before update platform value: http://boinc.berkeley.edu/trac/wiki/BoincPlatforms
platform = x86_64-pc-linux-gnu
#Work Unit number number of work unit
wu-number = 2
[template-base]
[template-base]
recipe = slapos.recipe.download
recipe = slapos.recipe.download
...
@@ -90,23 +94,34 @@ mode = 0644
...
@@ -90,23 +94,34 @@ mode = 0644
url = ${:_profile_base_location_}/templates/template_result
url = ${:_profile_base_location_}/templates/template_result
filename = template_result
filename = template_result
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
#md5sum =
md5sum = a3f0e9fd559cadcb2f297b952f8face8
[template_wu]
[template_wu]
<= template-base
<= template-base
url = ${:_profile_base_location_}/templates/template_wu
url = ${:_profile_base_location_}/templates/template_wu
filename = template_wu
filename = template_wu
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
#md5sum =
md5sum = 66d7ec85ce15e65d2858c11b75fb9574
[template_input]
[template_input]
<= template-base
<= template-base
url = ${:_profile_base_location_}/input/input_file
url = ${:_profile_base_location_}/input/input_file
filename = input_file
filename = input_file
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
#md5sum =
md5sum = 6f8db599de986fab7a21625b7916589c
[boinc-application]
app-list = {"${application:app-name}":{"${application:version}":{"use_default":true, "wu-number":2, "input-file":"${template_input:location}/${template_input:filename}", "binary":"${application:location}/${application:filename}"}}}
[boinc-default]
template-result = ${template_result:location}/${template_result:filename}
template-wu = ${template_wu:location}/${template_wu:filename}
platform = x86_64-pc-linux-gnu
extension =
##########################
###Condor description ####
###Condor description ####
##########################
[template-condor]
[template-condor]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
...
...
stack/boinc/buildout.cfg
View file @
0c4a78e7
...
@@ -34,7 +34,7 @@ eggs =
...
@@ -34,7 +34,7 @@ eggs =
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-boinc.cfg
url = ${:_profile_base_location_}/instance-boinc.cfg
output = ${buildout:directory}/template-boinc.cfg
output = ${buildout:directory}/template-boinc.cfg
md5sum =
cc95919d5400c4dfcd16646f25ba8c96
md5sum =
58aa7bbc2d088feb2c164468b9b2c85a
mode = 0644
mode = 0644
#Template for deploying MySQL Database Server
#Template for deploying MySQL Database Server
...
...
stack/boinc/instance-boinc.cfg
View file @
0c4a78e7
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
parts =
parts =
boinc-server
boinc-server
slap-application
boinc-app
certificate-authority
certificate-authority
ca-stunnel
ca-stunnel
logrotate
logrotate
...
@@ -217,7 +217,7 @@ mysql-port = $${stunnel:local-port}
...
@@ -217,7 +217,7 @@ mysql-port = $${stunnel:local-port}
#This allow to deploy or to update Boinc application using only slapparameters from
#This allow to deploy or to update Boinc application using only slapparameters from
#vifib BOINC instance parameters
#vifib BOINC instance parameters
[
slap-application
]
[
boinc-app
]
<= boinc-server
<= boinc-server
recipe = slapos.cookbook:boinc.app
recipe = slapos.cookbook:boinc.app
#appname and version is require to update any existing application
#appname and version is require to update any existing application
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment