Commit 36c820aa authored by Vivien Alger's avatar Vivien Alger

Changes to instance, software and kvm buildout profiles

parent 7d6bedb4
...@@ -6,11 +6,13 @@ eggs-directory = ${buildout:eggs-directory} ...@@ -6,11 +6,13 @@ eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
[kvminstance] [kvminstance]
recipe = ${instance-recipe:egg}:${instance-recipe:module} recipe = slapos.recipe.kvm
qemu_path = ${kvm:location}/bin/qemu-system-x86_64 qemu_path = ${kvm:location}/bin/qemu-system-x86_64
qemu_img_path = ${kvm:location}/bin/qemu-img qemu_img_path = ${kvm:location}/bin/qemu-img
slapmonitor_path = ${buildout:bin-directory}/slapmonitor slapmonitor_path = ${buildout:bin-directory}/slapmonitor
slapreport_path = ${buildout:bin-directory}/slapreport slapreport_path = ${buildout:bin-directory}/slapreport
websockify_path = ${buildout:parts-directory}/websockify/websockify
noVNC_location = ${buildout:parts-directory}/noVNC/
smp_count = 1 smp_count = 1
ram_size = 1024 ram_size = 1024
......
[buildout] [buildout]
extends =
../../stack/kvm.cfg
slaposcookbook_recipe_location = ${:parts-directory}/slaposcookbook
develop =
${:slaposcookbook_recipe_location}
versions = versions extends =
../../stack/kvm.cfg
parts += parts +=
template template
instance-recipe-egg
[instance-recipe-egg]
slaposcookbook_dummy = ${slaposcookbook:location}
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
md5sum = cea53c71db313471620155e1105ebee3 #md5sum = 6dd35876f5877fcab99f8d910058e076
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
[instance-recipe] [slaposcookbook]
egg = slapos.cookbook recipe = plone.recipe.command
module = kvm git_param = --quiet -b mysql
git = ${git:location}/bin/git
[instance-recipe-egg] location = ${buildout:parts-directory}/${:_buildout_section_name_}
recipe = zc.recipe.egg stop-on-error = true
python = python2.7 command = ${:git} clone ${:git_param} http://git.erp5.org/repos/slapos.git ${:location} || exit 1;
eggs = ${instance-recipe:egg} update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
\ No newline at end of file
[versions]
slapos.cookbook = 0.10
...@@ -7,9 +7,10 @@ extends = ...@@ -7,9 +7,10 @@ extends =
../component/readline/buildout.cfg ../component/readline/buildout.cfg
../component/ncurses/buildout.cfg ../component/ncurses/buildout.cfg
../component/libuuid/buildout.cfg ../component/libuuid/buildout.cfg
../component/noVNC/buildout.cfg
extensions = extensions =
slapos.tool.rebootstrap slapos.rebootstrap
parts = parts =
gnutls gnutls
...@@ -27,8 +28,8 @@ version = 1 ...@@ -27,8 +28,8 @@ version = 1
[gpg-error] [gpg-error]
recipe = hexagonit.recipe.cmmi recipe = hexagonit.recipe.cmmi
url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.9.tar.gz url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz
md5sum = 6dde8fd075aef8eaf8d3ae414447bb35 #md5sum = 6dde8fd075aef8eaf8d3ae414447bb35
[gcrypt] [gcrypt]
recipe = hexagonit.recipe.cmmi recipe = hexagonit.recipe.cmmi
...@@ -38,7 +39,7 @@ configure-options = ...@@ -38,7 +39,7 @@ configure-options =
--with-gpg-error-prefix=${gpg-error:location} --with-gpg-error-prefix=${gpg-error:location}
environment = environment =
CPPFLAGS=-I${gpg-error:location}/include CPPFLAGS=-I${gpg-error:location}/include
LDFLAGS=-Wl,-rpath -Wl,${gpg-error:location}/lib LDFLAGS=-Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gpg-error:location}/lib/libgpg-error.so.0
[gnutls] [gnutls]
recipe = hexagonit.recipe.cmmi recipe = hexagonit.recipe.cmmi
...@@ -48,7 +49,7 @@ configure-options = ...@@ -48,7 +49,7 @@ configure-options =
--with-libgcrypt-prefix=${gcrypt:location} --with-libgcrypt-prefix=${gcrypt:location}
environment = environment =
CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gcrypt:location}/include -I${gpg-error:location}/include CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gcrypt:location}/include -I${gpg-error:location}/include
LDFLAGS=-L${readline:location}/lib -L${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${gcrypt:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib LDFLAGS=-L${readline:location}/lib -L${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${gcrypt:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gcrypt:location}/lib/libgcrypt.so.11
PKG_CONFIG=${zlib:location}/lib/pkgconfig PKG_CONFIG=${zlib:location}/lib/pkgconfig
[kvm] [kvm]
...@@ -75,12 +76,11 @@ environment = ...@@ -75,12 +76,11 @@ environment =
recipe=plone.recipe.command recipe=plone.recipe.command
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true stop-on-error = true
tag = slapos-v0.1 #tag = slapos-v0.1
command = command =
(${git:location}/bin/git clone --quiet --branch ipv6 git://gitorious.org/slapos/slapos-kvm.git ${:location} && (${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.kvm.git ${:location} ) || (rm -fr ${:location} ; exit 1)
cd ${:location} && ${git:location}/bin/git pull --quiet origin tag ${:tag}) || (rm -fr ${:location} ; exit 1) #update-command =
update-command = # cd ${:location} && ${git:location}/bin/git pull --quiet origin tag ${:tag}
cd ${:location} && ${git:location}/bin/git pull --quiet origin tag ${:tag}
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
......
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