Commit f8cb38a1 authored by Łukasz Nowak's avatar Łukasz Nowak

Simplify and modernise profile.

Avoid using not required extensions:

 * slapos.rebootstrap is not needed, as python running buildout is somehow
   trusted, and it is enough to use python section in order to have own
   python compilation used by running software
 * slapos.zcbworkarounds is useful only in corner cases, which are not
   introduced in this profile
 * mr.developer is not used at all
parent 28d3bd16
[buildout] [buildout]
extensions =
slapos.rebootstrap
slapos.zcbworkarounds
mr.developer
find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/ find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/
http://dist.repoze.org http://dist.repoze.org
...@@ -20,7 +16,6 @@ extends = ...@@ -20,7 +16,6 @@ extends =
parts = parts =
template template
bootstrap
eggs eggs
subversion subversion
zip zip
...@@ -60,19 +55,6 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} ...@@ -60,19 +55,6 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = ${git:location}/bin/git clone -b erp5testnode --quiet http://git.erp5.org/repos/slapos.git ${:location} command = ${git:location}/bin/git clone -b erp5testnode --quiet http://git.erp5.org/repos/slapos.git ${:location}
update-command = cd ${:location} && ${git:location}/bin/git pull --quiet update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
[bootstrap]
recipe = zc.recipe.egg
eggs = zc.buildout
suffix =
scripts =
buildout=bootstrap2.7
arguments = sys.argv[1:] + ["bootstrap"]
[rebootstrap]
section = python2.7
version = 2
eggs = slapos.libnetworkcache
[versions] [versions]
# Use SlapOS patched zc.buildout # Use SlapOS patched zc.buildout
zc.buildout = 1.5.3-dev-SlapOS-005 zc.buildout = 1.5.3-dev-SlapOS-005
...@@ -97,6 +79,11 @@ scripts = ...@@ -97,6 +79,11 @@ scripts =
slapgrid-cp = slapos.grid.slapgrid:runComputerPartition slapgrid-cp = slapos.grid.slapgrid:runComputerPartition
slapproxy = sslapos.proxy:main slapproxy = sslapos.proxy:main
python = python2.7
[lxml-python]
python = python2.7
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
......
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