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
Eric Zheng
slapos
Commits
c475889a
Commit
c475889a
authored
Jul 01, 2015
by
Saurabh
Committed by
Julien Muchembled
Jul 13, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start new NEO cluster automatically
parent
ade51b79
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
2 deletions
+9
-2
slapos/recipe/neoppod.py
slapos/recipe/neoppod.py
+1
-0
software/neoppod/instance-neo-master.cfg.in
software/neoppod/instance-neo-master.cfg.in
+1
-0
software/neoppod/root-common.cfg.in
software/neoppod/root-common.cfg.in
+5
-0
software/neoppod/software-common.cfg
software/neoppod/software-common.cfg
+2
-2
No files found.
slapos/recipe/neoppod.py
View file @
c475889a
...
@@ -96,6 +96,7 @@ class Master(NeoBaseRecipe):
...
@@ -96,6 +96,7 @@ class Master(NeoBaseRecipe):
r
=
[
r
=
[
'-p'
,
options
[
'partitions'
],
'-p'
,
options
[
'partitions'
],
'-r'
,
options
[
'replicas'
],
'-r'
,
options
[
'replicas'
],
'-A'
,
options
[
'autostart'
],
]
]
for
x
in
((
'-C'
,
options
[
'upstream-cluster'
]),
for
x
in
((
'-C'
,
options
[
'upstream-cluster'
]),
(
'-M'
,
options
[
'upstream-masters'
])):
(
'-M'
,
options
[
'upstream-masters'
])):
...
...
software/neoppod/instance-neo-master.cfg.in
View file @
c475889a
...
@@ -15,6 +15,7 @@ partitions = {{ slapparameter_dict['partitions'] }}
...
@@ -15,6 +15,7 @@ partitions = {{ slapparameter_dict['partitions'] }}
replicas = {{ slapparameter_dict['replicas'] }}
replicas = {{ slapparameter_dict['replicas'] }}
upstream-cluster = {{ dumps(slapparameter_dict['upstream-cluster']) }}
upstream-cluster = {{ dumps(slapparameter_dict['upstream-cluster']) }}
upstream-masters = {{ dumps(slapparameter_dict['upstream-masters']) }}
upstream-masters = {{ dumps(slapparameter_dict['upstream-masters']) }}
autostart = {{ slapparameter_dict['autostart'] }}
# "masters" parameter is not provided when just requesting a partition.
# "masters" parameter is not provided when just requesting a partition.
# No actual installation takes place at that time
# No actual installation takes place at that time
# (slapos.cookbook:neoppod.master raises), but cfg expansion must succeed. So
# (slapos.cookbook:neoppod.master raises), but cfg expansion must succeed. So
...
...
software/neoppod/root-common.cfg.in
View file @
c475889a
...
@@ -46,6 +46,11 @@ config-upstream-cluster = {{ dumps(parameter_dict.get('upstream-cluster', '')) }
...
@@ -46,6 +46,11 @@ config-upstream-cluster = {{ dumps(parameter_dict.get('upstream-cluster', '')) }
config-upstream-masters = {{ dumps(parameter_dict.get('upstream-masters', '')) }}
config-upstream-masters = {{ dumps(parameter_dict.get('upstream-masters', '')) }}
software-type = {{ software_type }}
software-type = {{ software_type }}
{% set node_list = parameter_dict.get('node-list', ({},)) -%}
{% set node_list = parameter_dict.get('node-list', ({},)) -%}
{% set storage_count = [] -%}
{% for node in node_list -%}
{% do storage_count.append(node.get('storage-count', 1)) -%}
{% endfor -%}
config-autostart = {{ dumps(sum(storage_count)) }}
{% do assert(replicas < len(node_list)) -%}
{% do assert(replicas < len(node_list)) -%}
{% for i, node in enumerate(node_list) -%}
{% for i, node in enumerate(node_list) -%}
{% set section_id = prefix ~ i -%}
{% set section_id = prefix ~ i -%}
...
...
software/neoppod/software-common.cfg
View file @
c475889a
...
@@ -74,7 +74,7 @@ context =
...
@@ -74,7 +74,7 @@ context =
[root-common]
[root-common]
<= download-base-neo
<= download-base-neo
md5sum = f
009499b02cacff311a27aff6550e501
md5sum = f
3182000925308bc694d1dab46d8142b
[instance-neo-admin]
[instance-neo-admin]
<= download-base-neo
<= download-base-neo
...
@@ -82,7 +82,7 @@ md5sum = 16d11f0fe74de06aebbadcff3527db1c
...
@@ -82,7 +82,7 @@ md5sum = 16d11f0fe74de06aebbadcff3527db1c
[instance-neo-master]
[instance-neo-master]
<= download-base-neo
<= download-base-neo
md5sum =
9563ce56676bf9ae5e77fe12e9020289
md5sum =
023f08763dbba2319f58e5c597f7761d
[instance-neo-storage-mysql]
[instance-neo-storage-mysql]
<= download-base-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