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
Labels
Merge Requests
103
Merge Requests
103
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
289a376b
Commit
289a376b
authored
Jan 30, 2020
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Plain Diff
Update Release Candidate
parents
1c983a5e
78605aef
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
32 additions
and
42 deletions
+32
-42
CHANGES.rst
CHANGES.rst
+6
-0
component/trafficserver/buildout.cfg
component/trafficserver/buildout.cfg
+0
-23
setup.py
setup.py
+1
-1
slapos/recipe/erp5testnode/template/erp5testnode.cfg.in
slapos/recipe/erp5testnode/template/erp5testnode.cfg.in
+1
-0
software/apache-frontend/buildout.hash.cfg
software/apache-frontend/buildout.hash.cfg
+1
-1
software/apache-frontend/instance-apache-frontend.cfg
software/apache-frontend/instance-apache-frontend.cfg
+1
-1
software/caddy-frontend/common.cfg
software/caddy-frontend/common.cfg
+1
-1
software/erp5testnode/buildout.hash.cfg
software/erp5testnode/buildout.hash.cfg
+1
-1
software/erp5testnode/instance-default.cfg
software/erp5testnode/instance-default.cfg
+2
-0
software/erp5testnode/testsuite/deploy-test/software.cfg
software/erp5testnode/testsuite/deploy-test/software.cfg
+1
-5
software/helloworld/buildout.hash.cfg
software/helloworld/buildout.hash.cfg
+1
-1
software/helloworld/instance.cfg.in
software/helloworld/instance.cfg.in
+5
-5
software/kvm/buildout.hash.cfg
software/kvm/buildout.hash.cfg
+1
-1
software/kvm/instance-kvm.cfg.jinja2
software/kvm/instance-kvm.cfg.jinja2
+8
-0
stack/slapos.cfg
stack/slapos.cfg
+2
-2
No files found.
CHANGES.rst
View file @
289a376b
Changes
Changes
=======
=======
1.0.124 (2020-01-30)
--------------------
- cookbook:erp5testnode: new shared_part_list option
1.0.123 (2019-10-03)
1.0.123 (2019-10-03)
--------------------
--------------------
...
...
component/trafficserver/buildout.cfg
View file @
289a376b
...
@@ -16,29 +16,6 @@ parts =
...
@@ -16,29 +16,6 @@ parts =
[trafficserver]
[trafficserver]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://apache.claz.org/trafficserver/trafficserver-4.2.3.tar.bz2
md5sum = 1d06a6e9063ceea3f19dbb84752ec710
configure-options =
--with-openssl=${openssl-1.0:location}
--with-xml=libxml2
--with-libxml2=${libxml2:location}
--with-pcre=${pcre:location}
--without-lua
--with-ncurses=${ncurses:location}
--with-tcl=${tcl:location}/lib/
--with-lzma=${xz-utils:location}
--with-zlib=${zlib:location}
--disable-hwloc
--enable-experimental-plugins
environment =
PATH=${libtool:location}/bin:${make:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
LDFLAGS =-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
make-target =
check
install
[trafficserver7]
recipe = slapos.recipe.cmmi
url = http://apache.claz.org/trafficserver/trafficserver-7.1.6.tar.bz2
url = http://apache.claz.org/trafficserver/trafficserver-7.1.6.tar.bz2
md5sum = 45f67cd652fa3481f76ff92213325c84
md5sum = 45f67cd652fa3481f76ff92213325c84
configure-options =
configure-options =
...
...
setup.py
View file @
289a376b
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import
glob
import
glob
import
os
import
os
version
=
'1.0.12
3
'
version
=
'1.0.12
4
'
name
=
'slapos.cookbook'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.rst"
).
read
()
+
"
\
n
"
+
\
long_description
=
open
(
"README.rst"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.rst"
).
read
()
+
"
\
n
"
open
(
"CHANGES.rst"
).
read
()
+
"
\
n
"
...
...
slapos/recipe/erp5testnode/template/erp5testnode.cfg.in
View file @
289a376b
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
slapos_directory = %(slapos_directory)s
slapos_directory = %(slapos_directory)s
working_directory = %(working_directory)s
working_directory = %(working_directory)s
test_suite_directory = %(test_suite_directory)s
test_suite_directory = %(test_suite_directory)s
shared_part_list = %(shared_part_list)s
software_directory = %(software_directory)s
software_directory = %(software_directory)s
log_directory = %(log_directory)s
log_directory = %(log_directory)s
run_directory = %(run_directory)s
run_directory = %(run_directory)s
...
...
software/apache-frontend/buildout.hash.cfg
View file @
289a376b
...
@@ -18,7 +18,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
...
@@ -18,7 +18,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
[template-apache-frontend]
[template-apache-frontend]
filename = instance-apache-frontend.cfg
filename = instance-apache-frontend.cfg
md5sum =
d6398d727eb1e1bc3df1768a9b9a7e0c
md5sum =
eb2143422d824e96abe99619f11d3523
[template-apache-replicate]
[template-apache-replicate]
filename = instance-apache-replicate.cfg.in
filename = instance-apache-replicate.cfg.in
...
...
software/apache-frontend/instance-apache-frontend.cfg
View file @
289a376b
...
@@ -198,7 +198,7 @@ extra-context =
...
@@ -198,7 +198,7 @@ extra-context =
section apache_configuration apache-configuration
section apache_configuration apache-configuration
section nginx_configuration nginx-configuration
section nginx_configuration nginx-configuration
key monitor_base_url monitor-instance-parameter:monitor-base-url
key monitor_base_url monitor-instance-parameter:monitor-base-url
key promise_directory directory:promise
s
key promise_directory directory:promise
key report_directory directory:bin
key report_directory directory:bin
raw bin_directory ${buildout:bin-directory}
raw bin_directory ${buildout:bin-directory}
...
...
software/caddy-frontend/common.cfg
View file @
289a376b
...
@@ -105,7 +105,7 @@ gzip = ${gzip:location}
...
@@ -105,7 +105,7 @@ gzip = ${gzip:location}
logrotate = ${logrotate:location}
logrotate = ${logrotate:location}
openssl = ${openssl:location}/bin/openssl
openssl = ${openssl:location}/bin/openssl
openssl_cnf = ${openssl:location}/etc/ssl/openssl.cnf
openssl_cnf = ${openssl:location}/etc/ssl/openssl.cnf
trafficserver = ${trafficserver
7
:location}
trafficserver = ${trafficserver:location}
sha256sum = ${coreutils:location}/bin/sha256sum
sha256sum = ${coreutils:location}/bin/sha256sum
kedifa = ${:bin_directory}/kedifa
kedifa = ${:bin_directory}/kedifa
kedifa-updater = ${:bin_directory}/kedifa-updater
kedifa-updater = ${:bin_directory}/kedifa-updater
...
...
software/erp5testnode/buildout.hash.cfg
View file @
289a376b
...
@@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e
...
@@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e
[template-default]
[template-default]
filename = instance-default.cfg
filename = instance-default.cfg
md5sum =
a76803eedf0c66fe7649b62efc86c8fe
md5sum =
3c2420de64f079b3b3231dfbff1633b5
software/erp5testnode/instance-default.cfg
View file @
289a376b
...
@@ -33,6 +33,7 @@ recipe = slapos.cookbook:erp5testnode
...
@@ -33,6 +33,7 @@ recipe = slapos.cookbook:erp5testnode
slapos-directory = $${directory:slapos}
slapos-directory = $${directory:slapos}
working-directory = $${directory:testnode}
working-directory = $${directory:testnode}
test-suite-directory = $${directory:test-suite}
test-suite-directory = $${directory:test-suite}
shared-part-list = $${directory:shared}
proxy-host = $${slap-network-information:local-ipv4}
proxy-host = $${slap-network-information:local-ipv4}
proxy-port = 5000
proxy-port = 5000
log-directory = $${directory:log}
log-directory = $${directory:log}
...
@@ -188,6 +189,7 @@ run = $${rootdirectory:var}/run
...
@@ -188,6 +189,7 @@ run = $${rootdirectory:var}/run
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
slapos = $${rootdirectory:srv}/slapos
slapos = $${rootdirectory:srv}/slapos
testnode = $${rootdirectory:srv}/testnode
testnode = $${rootdirectory:srv}/testnode
shared = $${rootdirectory:srv}/shared
test-suite = $${rootdirectory:srv}/test_suite
test-suite = $${rootdirectory:srv}/test_suite
log = $${basedirectory:log}/testnode
log = $${basedirectory:log}/testnode
run = $${basedirectory:run}/testnode
run = $${basedirectory:run}/testnode
...
...
software/erp5testnode/testsuite/deploy-test/software.cfg
View file @
289a376b
[buildout]
[buildout]
extends =
extends =
buildout.hash.cfg
buildout.hash.cfg
https://lab.nexedi.com/nexedi/slapos/raw/1.0.112/software/kvm/software.cfg
https://lab.nexedi.com/nexedi/slapos/raw/1.0.134/software/kvm/software.cfg
# PyPi servers from new host since some time and change is not incorporated in extended KVM SR
allow-hosts +=
files.pythonhosted.org
parts =
parts =
eggs
eggs
...
...
software/helloworld/buildout.hash.cfg
View file @
289a376b
...
@@ -14,4 +14,4 @@
...
@@ -14,4 +14,4 @@
# not need these here).
# not need these here).
[instance-profile]
[instance-profile]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
cc8902e44c1d50804b570775633b8c2a
md5sum =
dcb9d2f540e0e397c9346c8b0c05f233
software/helloworld/instance.cfg.in
View file @
289a376b
...
@@ -26,11 +26,11 @@ extends = {{ template_monitor }}
...
@@ -26,11 +26,11 @@ extends = {{ template_monitor }}
# Always the same. Just copy/paste.
# Always the same. Just copy/paste.
# See docstring of slapos.cookbook:slapconfiguration for more information.
# See docstring of slapos.cookbook:slapconfiguration for more information.
recipe = slapos.cookbook:slapconfiguration
recipe = slapos.cookbook:slapconfiguration
computer = ${slap
_connection:computer_
id}
computer = ${slap
-connection:computer-
id}
partition = ${slap
_connection:partition_
id}
partition = ${slap
-connection:partition-
id}
url = ${slap
_connection:server_
url}
url = ${slap
-connection:server-
url}
key = ${slap
_connection:key_
file}
key = ${slap
-connection:key-
file}
cert = ${slap
_connection:cert_
file}
cert = ${slap
-connection:cert-
file}
# Define default parameter(s) that will be used later, in case user didn't
# Define default parameter(s) that will be used later, in case user didn't
# specify it.
# specify it.
...
...
software/kvm/buildout.hash.cfg
View file @
289a376b
...
@@ -19,7 +19,7 @@ md5sum = a236b719aaac61ac342ada0ce569151a
...
@@ -19,7 +19,7 @@ md5sum = a236b719aaac61ac342ada0ce569151a
[template-kvm]
[template-kvm]
filename = instance-kvm.cfg.jinja2
filename = instance-kvm.cfg.jinja2
md5sum =
891d98667feb8daaa9f61b5bf09d5de0
md5sum =
d604d8696815716ac51af770164e86d5
[template-kvm-cluster]
[template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in
filename = instance-kvm-cluster.cfg.jinja2.in
...
...
software/kvm/instance-kvm.cfg.jinja2
View file @
289a376b
...
@@ -823,6 +823,14 @@ template = inline:
...
@@ -823,6 +823,14 @@ template = inline:
rendered = ${buildout:directory}/.slapos-disk-permission
rendered = ${buildout:directory}/.slapos-disk-permission
context =
context =
raw disk_device_path {{disk_device_path}}
raw disk_device_path {{disk_device_path}}
{% do part_list.append('wipe-disk-device-wrapper') -%}
[wipe-disk-device-wrapper]
recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:prerm}/slapos_wipe_device_disk
command-line =
dd if=/dev/zero of={{disk_device_path}} bs=4096 count=500k
{% endif -%}
{% endif -%}
[buildout]
[buildout]
...
...
stack/slapos.cfg
View file @
289a376b
...
@@ -137,7 +137,7 @@ pyparsing = 2.2.0
...
@@ -137,7 +137,7 @@ pyparsing = 2.2.0
pytz = 2016.10
pytz = 2016.10
requests = 2.13.0
requests = 2.13.0
six = 1.12.0
six = 1.12.0
slapos.cookbook = 1.0.12
3
slapos.cookbook = 1.0.12
4
slapos.core = 1.5.7
slapos.core = 1.5.7
slapos.extension.strip = 0.4
slapos.extension.strip = 0.4
slapos.extension.shared = 1.0
slapos.extension.shared = 1.0
...
@@ -196,7 +196,7 @@ enum34 = 1.1.6
...
@@ -196,7 +196,7 @@ enum34 = 1.1.6
# Required by:
# Required by:
# slapos.toolbox==0.94
# slapos.toolbox==0.94
erp5.util = 0.4.6
5
erp5.util = 0.4.6
6
# Required by:
# Required by:
# slapos.toolbox==0.94
# slapos.toolbox==0.94
...
...
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