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
Xiaowu Zhang
slapos
Commits
d82a4ee8
Commit
d82a4ee8
authored
Sep 16, 2019
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NEO: fix instanciation with several subpartitions
parent
9b653c7d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
software/neoppod/instance-neo-admin.cfg.in
software/neoppod/instance-neo-admin.cfg.in
+2
-0
software/neoppod/instance-neo-master.cfg.in
software/neoppod/instance-neo-master.cfg.in
+2
-0
software/neoppod/software-common.cfg
software/neoppod/software-common.cfg
+2
-2
No files found.
software/neoppod/instance-neo-admin.cfg.in
View file @
d82a4ee8
{%- if slapparameter_dict.get('admin') != 0 %}
{%- set monitor_dict = slapparameter_dict['monitor'] %}
{%- set bang_on_problem = monitor_dict.pop('bang-on-problem', None) %}
{%- set periodicity = monitor_dict.pop('periodicity', None) %}
...
...
@@ -68,3 +69,4 @@ command-line =
--key ${directory:etc}/neo.key
{%- endif %}
wrapper-path = ${directory:bin}/neoctl
{%- endif %}
software/neoppod/instance-neo-master.cfg.in
View file @
d82a4ee8
{%- if slapparameter_dict.get('master') != 0 %}
[buildout]
parts +=
logrotate-master
...
...
@@ -27,3 +28,4 @@ masters = {{ dumps(slapparameter_dict['masters']) }}
name = neo-master
log = ${neo-master:logfile}
post = {{ bin_directory }}/slapos-kill -s RTMIN+1 -- ${neo-master:binary} -l ${:log}
{%- endif %}
software/neoppod/software-common.cfg
View file @
d82a4ee8
...
...
@@ -116,11 +116,11 @@ md5sum = ccc6e33412259415ec6c3452d37b77cc
[instance-neo-admin]
<= download-base-neo
md5sum =
5873b385bed7207ca865536fd63bb610
md5sum =
87670ddc6b5d2007dac1b6d2ba86d168
[instance-neo-master]
<= download-base-neo
md5sum =
728c407bc526252aec2222752226dde6
md5sum =
9f27195d770b2f57461c60a82c851ab9
[instance-neo]
<= 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