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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Thompson
slapos
Commits
dc2ff6a5
Commit
dc2ff6a5
authored
Nov 29, 2019
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Plain Diff
Update Release Candidate
parents
9e0c4fda
6fbc6e15
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
24 additions
and
5 deletions
+24
-5
component/vm-img/debian.cfg
component/vm-img/debian.cfg
+1
-0
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+1
-0
software/neoppod/buildout.hash.cfg
software/neoppod/buildout.hash.cfg
+1
-1
software/neoppod/instance-neo-input-schema.json
software/neoppod/instance-neo-input-schema.json
+1
-1
software/neoppod/instance-neo.cfg.in
software/neoppod/instance-neo.cfg.in
+2
-0
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+1
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+1
-1
software/slaprunner/test/test.py
software/slaprunner/test/test.py
+15
-0
stack/slapos.cfg
stack/slapos.cfg
+1
-1
No files found.
component/vm-img/debian.cfg
View file @
dc2ff6a5
...
@@ -18,6 +18,7 @@ recipe = slapos.recipe.build:vm.run
...
@@ -18,6 +18,7 @@ recipe = slapos.recipe.build:vm.run
environment = vm-run-environment
environment = vm-run-environment
vm = ${vm-debian:location}
vm = ${vm-debian:location}
dist = ${vm-debian:dists}
dist = ${vm-debian:dists}
wait-ssh = 100
[vm-debian]
[vm-debian]
recipe = slapos.recipe.build:vm.install-debian
recipe = slapos.recipe.build:vm.install-debian
...
...
software/caddy-frontend/test/test.py
View file @
dc2ff6a5
...
@@ -559,6 +559,7 @@ class SlaveHttpFrontendTestCase(SlapOSInstanceTestCase):
...
@@ -559,6 +559,7 @@ class SlaveHttpFrontendTestCase(SlapOSInstanceTestCase):
cls
.
waitForCaddy
()
cls
.
waitForCaddy
()
except
BaseException
:
except
BaseException
:
cls
.
logger
.
exception
(
"Error during setUpClass"
)
cls
.
logger
.
exception
(
"Error during setUpClass"
)
cls
.
_storeSnapshot
(
"{}.setUpClass"
.
format
(
cls
.
__name__
))
cls
.
_cleanup
()
cls
.
_cleanup
()
cls
.
setUp
=
lambda
self
:
self
.
fail
(
'Setup Class failed.'
)
cls
.
setUp
=
lambda
self
:
self
.
fail
(
'Setup Class failed.'
)
raise
raise
...
...
software/neoppod/buildout.hash.cfg
View file @
dc2ff6a5
...
@@ -30,7 +30,7 @@ md5sum = 9f27195d770b2f57461c60a82c851ab9
...
@@ -30,7 +30,7 @@ md5sum = 9f27195d770b2f57461c60a82c851ab9
[instance-neo]
[instance-neo]
filename = instance-neo.cfg.in
filename = instance-neo.cfg.in
md5sum =
d18e049d580720e733502b774b0d6790
md5sum =
574acb0cae9af8ec2af52825fb2436d8
[template-neo-my-cnf]
[template-neo-my-cnf]
filename = my.cnf.in
filename = my.cnf.in
...
...
software/neoppod/instance-neo-input-schema.json
View file @
dc2ff6a5
...
@@ -129,7 +129,7 @@
...
@@ -129,7 +129,7 @@
"type"
:
"object"
"type"
:
"object"
},
},
"engine"
:
{
"engine"
:
{
"description"
:
"Configures storage engine, currently only InnoDB and TokuDB are supported. Defaults to NEO's default."
,
"description"
:
"Configures storage engine, currently only InnoDB
, RocksDB
and TokuDB are supported. Defaults to NEO's default."
,
"type"
:
"string"
"type"
:
"string"
}
}
},
},
...
...
software/neoppod/instance-neo.cfg.in
View file @
dc2ff6a5
...
@@ -90,7 +90,9 @@ cluster = {{ dumps(slapparameter_dict['cluster']) }}
...
@@ -90,7 +90,9 @@ cluster = {{ dumps(slapparameter_dict['cluster']) }}
masters = {{ dumps(slapparameter_dict['masters']) }}
masters = {{ dumps(slapparameter_dict['masters']) }}
database-adapter = {{ storage_type }}
database-adapter = {{ storage_type }}
wait-database = -1
wait-database = -1
{%- if mysql %}
engine = ${my-cnf-parameters:engine}
engine = ${my-cnf-parameters:engine}
{%- endif %}
dedup = {{ dumps(bool(slapparameter_dict.get('data-deduplication'))) }}
dedup = {{ dumps(bool(slapparameter_dict.get('data-deduplication'))) }}
disable-drop-partitions = {{ dumps(bool(slapparameter_dict.get('disable-drop-partitions'))) }}
disable-drop-partitions = {{ dumps(bool(slapparameter_dict.get('disable-drop-partitions'))) }}
...
...
software/slaprunner/buildout.hash.cfg
View file @
dc2ff6a5
...
@@ -18,7 +18,7 @@ md5sum = 8b78e32b877d591400746ec7fd68ed4c
...
@@ -18,7 +18,7 @@ md5sum = 8b78e32b877d591400746ec7fd68ed4c
[template-runner]
[template-runner]
filename = instance-runner.cfg
filename = instance-runner.cfg
md5sum = 8
5ea0b78fd18428c242438ebe95f980b
md5sum = 8
7545b1f9f3865c8cb1347edeb340678
[template-runner-import-script]
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
filename = template/runner-import.sh.jinja2
...
...
software/slaprunner/instance-runner.cfg
View file @
dc2ff6a5
...
@@ -115,7 +115,7 @@ name = custom_frontend_ready_promise.py
...
@@ -115,7 +115,7 @@ name = custom_frontend_ready_promise.py
config-command = $${custom-frontend-url-ready-promise-bin:rendered}
config-command = $${custom-frontend-url-ready-promise-bin:rendered}
[publish-connection-information]
[publish-connection-information]
custom-frontend-url = $${custom-frontend-url-ready-promise:url}
custom-frontend-url = $${custom-frontend-url-ready-promise
-bin
:url}
{% endif %}
{% endif %}
# Create all needed directories
# Create all needed directories
...
...
software/slaprunner/test/test.py
View file @
dc2ff6a5
...
@@ -297,3 +297,18 @@ class TestInstanceResilient(SlaprunnerTestCase):
...
@@ -297,3 +297,18 @@ class TestInstanceResilient(SlaprunnerTestCase):
'takeover-runner-1-url'
,
'takeover-runner-1-url'
,
'url'
,
'url'
,
'webdav-url'
]))
'webdav-url'
]))
class
TestCustomFrontend
(
SlaprunnerTestCase
):
@
classmethod
def
getInstanceParameterDict
(
cls
):
return
{
'custom-frontend-backend-url'
:
'https://www.erp5.com'
,
'custom-frontend-backend-type'
:
'redirect'
,
}
def
test
(
self
):
parameter_dict
=
self
.
computer_partition
.
getConnectionParameterDict
()
self
.
assertEqual
(
parameter_dict
[
'custom-frontend-url'
],
'https://www.erp5.com'
)
stack/slapos.cfg
View file @
dc2ff6a5
...
@@ -137,7 +137,7 @@ pytz = 2016.10
...
@@ -137,7 +137,7 @@ pytz = 2016.10
requests = 2.13.0
requests = 2.13.0
six = 1.12.0
six = 1.12.0
slapos.cookbook = 1.0.123
slapos.cookbook = 1.0.123
slapos.core = 1.5.
3
slapos.core = 1.5.
4
slapos.extension.strip = 0.4
slapos.extension.strip = 0.4
slapos.extension.shared = 1.0
slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.19
slapos.libnetworkcache = 0.19
...
...
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