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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Thomas Gambier
slapos
Commits
0b1bd1b0
Commit
0b1bd1b0
authored
Jun 12, 2017
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NEO: add support for new --disable-drop-partitions storage option
parent
126a4b5e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
1 deletion
+9
-1
slapos/recipe/neoppod.py
slapos/recipe/neoppod.py
+2
-0
software/neoppod/instance-neo-input-schema.json
software/neoppod/instance-neo-input-schema.json
+5
-0
software/neoppod/instance-neo-storage-mysql.cfg.in
software/neoppod/instance-neo-storage-mysql.cfg.in
+1
-0
software/neoppod/software-common.cfg
software/neoppod/software-common.cfg
+1
-1
No files found.
slapos/recipe/neoppod.py
View file @
0b1bd1b0
...
...
@@ -92,6 +92,8 @@ class Storage(NeoBaseRecipe):
engine
=
self
.
options
.
get
(
'engine'
)
if
engine
:
# old versions of NEO don't support -e
r
+=
'-e'
,
engine
if
self
.
options
.
get
(
'disable-drop-partitions'
):
r
.
append
(
'--disable-drop-partitions'
)
return
r
class
Admin
(
NeoBaseRecipe
):
...
...
software/neoppod/instance-neo-input-schema.json
View file @
0b1bd1b0
...
...
@@ -70,6 +70,11 @@
"default"
:
1
,
"type"
:
"integer"
},
"disable-drop-partitions"
:
{
"description"
:
"Set the --disable-drop-partitions option for storage nodes."
,
"default"
:
false
,
"type"
:
"boolean"
},
"mysql"
:
{
"description"
:
"Dictionary containing parameters for MySQL."
,
"default"
:
{},
...
...
software/neoppod/instance-neo-storage-mysql.cfg.in
View file @
0b1bd1b0
...
...
@@ -87,6 +87,7 @@ masters = ${publish:masters}
database-adapter = MySQL
wait-database = -1
engine = {{ slapparameter_dict.get('engine', '') }}
disable-drop-partitions = {{ dumps(bool(slapparameter_dict.get('disable-drop-partitions'))) }}
{% for i in range(slapparameter_dict.get('storage-count', 1)) -%}
{% set storage_id = 'neo-storage-' ~ i -%}
...
...
software/neoppod/software-common.cfg
View file @
0b1bd1b0
...
...
@@ -99,7 +99,7 @@ md5sum = 1fee10f02c2fa2a581e21878ca0fd704
[instance-neo-storage-mysql]
<= download-base-neo
md5sum =
836ae32d4b6d502d0a597cb28ebf7616
md5sum =
67d623d631c2f99e33bcabc79fc9cccf
[template-neo-my-cnf]
<= download-base-neo
...
...
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