IPython Notebook: Added software type default and notebook for notebook software release

software/ipython_notebook/instance-ipython-default.cfg.in → software/ipython_notebook/instance-default.cfg.in

 [buildout]
-extends = 
-    ${template-ipythonnotebook:output}
+parts =
+  request-ipythonnotebook
+  publish-connection-parameter
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
 
 [request-ipythonnotebook]
 <= slap-connection
@@ -9,3 +14,8 @@ name = IPython Notebook
 software-url = $${slap-connection:software-release-url}
 software-type = notebook
 return = url
+sla-computer_guid = $${slap-connection:computer-id}
+
+[publish-connection-parameter]
+recipe = slapos.cookbook:publish
+notebook_url = $${request-ipythonnotebook:connection-url}
\ No newline at end of file

software/ipython_notebook/instance-ipython-notebook.cfg.in → software/ipython_notebook/instance-notebook.cfg.in

@@ -32,15 +32,6 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[slapconfiguration]
-recipe = slapos.cookbook:slapconfiguration
-computer = $${slap-connection:computer-id}
-partition = $${slap-connection:partition-id}
-url = $${slap-connection:server-url}
-key = $${slap-connection:key-file}
-cert = $${slap-connection:cert-file}
-configuration.erp5_url = https://softinst60318.host.vifib.net/erp5/Base_executePython
-
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
 rendered = $${buildout:directory}/$${:filename}
@@ -54,6 +45,15 @@ context =
     key slave_instance_list slap-parameters:slave-instance-list
     $${:extra-context}
 
+[slapconfiguration]
+recipe = slapos.cookbook:slapconfiguration
+computer = $${slap-connection:computer-id}
+partition = $${slap-connection:partition-id}
+url = $${slap-connection:server-url}
+key = $${slap-connection:key-file}
+cert = $${slap-connection:cert-file}
+configuration.erp5_url = https://softinst60318.host.vifib.net/erp5/Base_executePython
+
 [instance-parameter]
 port = 8888
 host = $${slapconfiguration:ipv6-random}

software/ipython_notebook/instance.cfg

 [buildout]
+
 parts =
   switch-softwaretype
 
@@ -8,5 +9,5 @@ offline = true
 
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = ${default-template-ipythonnotebook:output}
-notebook = ${template-ipythonnotebook:output}
+default = ${instance-default:output}
+notebook = ${instance-notebook:output}
\ No newline at end of file

software/ipython_notebook/software.cfg

@@ -15,8 +15,8 @@ parts =
   ipython_notebook
   ipython_notebook_set_password
   instance
-  template-ipythonnotebook
-  default-template-ipythonnotebook
+  instance-notebook
+  instance-default
 
 [ipython_notebook]
 ; In the ipython notebook software, we use more eggs than in the minimal
@@ -53,19 +53,15 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/instance.cfg
 
-[template-ipythonnotebook]
+[instance-default]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-ipython-notebook.cfg.in
-md5sum = 5ba2484c3550a3254d14fcf1ed5fa6f4
-output = ${buildout:directory}/template-ipython-notebook.cfg
-mode = 0644
+url = ${:_profile_base_location_}/instance-default.cfg.in
+output = ${buildout:directory}/template-default.cfg
 
-[default-template-ipythonnotebook]
+[instance-notebook]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-ipython-default.cfg.in
-md5sum = 9150cb3e60dddcde8060d04911e82323
-output = ${buildout:directory}/temlate-ipython-default.cfg.in
-mode = 0644
+url = ${:_profile_base_location_}/instance-notebook.cfg.in
+output = ${buildout:directory}/template-notebook.cfg
 
 [erp5-kernel]
 recipe = hexagonit.recipe.download