Update BonjourGrid to use new BOINC parameter definition

software/boinc/boinc-app.cfg

-[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

@@ -2,6 +2,7 @@
 
 parts =
   boinc-server
+  boinc-app
   certificate-authority
   ca-stunnel
   logrotate
@@ -12,14 +13,9 @@ parts  =
   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}
@@ -33,20 +29,3 @@ boinc = $${rootdirectory:etc}/boinc/
 [boinc-server]
 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/instance-bonjourgrid.cfg

@@ -14,14 +14,10 @@ parts =
   cron-entry-boinc
   promise
   slapmonitor
-  slapreport
   frontend-promise
   content-promise
   publish-connection-informations
-#User application
   boinc-app
-#slap application
-  slap-application
   condor
   app-submit
 
@@ -57,7 +53,7 @@ redis-passwd = $${slap-parameter:server-password}
 type = $${slap-parameter:project-type}
 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}
 ipv6 = $${condor:ip}
 

software/bonjourgrid/software.cfg

@@ -7,7 +7,7 @@ develop =
 parts = 
   boinc-instance
   template
-  boinc-application
+  application
   template_wu
   template_result
   template_input
@@ -32,18 +32,31 @@ extends =
   ../../stack/slapos.cfg
 
 #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]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-bonjourgrid.cfg
 output = ${buildout:directory}/template-bonjourgrid.cfg
 mode = 0644
-md5sum = 16e6f827c1fcc2a62ab8eaea167bf937
+md5sum = 216b87eb0675cb5f61462d21fff3a392
 
 [bonjourgrid]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/bonjourgrid.src/bonjourgrid.tar.gz
-md5sum = d67764e80cedb51c6420ae8b711db5db
+md5sum = 22925dcf5a8ceb8da449ccf52402a195
 
+#################################
+### Redis-Server description ####
+#################################
 [template-redis]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-redis.cfg
@@ -51,22 +64,18 @@ output = ${buildout:directory}/template-redis.cfg
 mode = 0644
 md5sum = 8b223d1fe0ffd40c7151766730da7fcb
 
+#################################
+### BOINC Server description ####
+#################################
 [boinc-instance]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/boinc-app.cfg
 output = ${buildout:directory}/template-boinc-app.cfg
 mode = 0644
-md5sum = 6522c134cbdc52daf0f8983a45153100
-
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-output = ${buildout:directory}/template.cfg
-mode = 0644
-md5sum = 2f23572c39bfcedcdebdb5963aeefc38
+md5sum = 97bf1a369946b50ae1163e2d83209857
 
 #Download Boinc Application Binary and configure project
-[boinc-application]
+[application]
 recipe = hexagonit.recipe.download
 url = ${boinc:location}/libexec/examples/upper_case
 download-only = true
@@ -74,11 +83,6 @@ filename = upper_case
 #Application configuration
 app-name = upper_case
 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]
 recipe = slapos.recipe.download
@@ -90,23 +94,34 @@ mode = 0644
 url = ${:_profile_base_location_}/templates/template_result
 filename = template_result
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-#md5sum = 
+md5sum = a3f0e9fd559cadcb2f297b952f8face8
 
 [template_wu]
 <= template-base
 url = ${:_profile_base_location_}/templates/template_wu
 filename = template_wu
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-#md5sum = 
+md5sum = 66d7ec85ce15e65d2858c11b75fb9574
 
 [template_input]
 <= template-base
 url = ${:_profile_base_location_}/input/input_file
 filename = input_file
 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 ####
+##########################
 
 [template-condor]
 recipe = slapos.recipe.template

stack/boinc/buildout.cfg

@@ -34,7 +34,7 @@ eggs =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-boinc.cfg
 output = ${buildout:directory}/template-boinc.cfg
-md5sum = cc95919d5400c4dfcd16646f25ba8c96
+md5sum = 58aa7bbc2d088feb2c164468b9b2c85a
 mode = 0644
 
 #Template for deploying MySQL Database Server

stack/boinc/instance-boinc.cfg

@@ -2,7 +2,7 @@
 
 parts =
   boinc-server
-  slap-application
+  boinc-app
   certificate-authority
   ca-stunnel
   logrotate
@@ -217,7 +217,7 @@ mysql-port = $${stunnel:local-port}
 
 #This allow to deploy or to update Boinc application using only slapparameters from
 #vifib BOINC instance parameters
-[slap-application]
+[boinc-app]
 <= boinc-server
 recipe = slapos.cookbook:boinc.app
 #appname and version is require to update any existing application