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
Aurélien Vermylen
slapos
Commits
914cc144
Commit
914cc144
authored
Jul 09, 2013
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
neoppod: Drop "verbose" parameter, as it's not supported by NEO.
parent
9a556ba5
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
5 additions
and
16 deletions
+5
-16
slapos/recipe/neoppod.py
slapos/recipe/neoppod.py
+0
-2
software/neoppod/README.txt
software/neoppod/README.txt
+0
-5
software/neoppod/cluster.cfg.in
software/neoppod/cluster.cfg.in
+1
-2
software/neoppod/instance-neo-admin.cfg.in
software/neoppod/instance-neo-admin.cfg.in
+0
-1
software/neoppod/instance-neo-master.cfg.in
software/neoppod/instance-neo-master.cfg.in
+0
-1
software/neoppod/instance-neo-storage-mysql.cfg.in
software/neoppod/instance-neo-storage-mysql.cfg.in
+0
-1
software/neoppod/software.cfg
software/neoppod/software.cfg
+4
-4
No files found.
slapos/recipe/neoppod.py
View file @
914cc144
...
@@ -50,8 +50,6 @@ class NeoBaseRecipe(GenericBaseRecipe):
...
@@ -50,8 +50,6 @@ class NeoBaseRecipe(GenericBaseRecipe):
#'-n', options['name'],
#'-n', options['name'],
'-c'
,
options
[
'cluster'
],
'-c'
,
options
[
'cluster'
],
]
]
if
options
[
'verbose'
]:
option_list
.
append
(
'-v'
)
option_list
.
extend
(
self
.
_getOptionList
())
option_list
.
extend
(
self
.
_getOptionList
())
return
[
self
.
createPythonScript
(
return
[
self
.
createPythonScript
(
options
[
'wrapper'
],
options
[
'wrapper'
],
...
...
software/neoppod/README.txt
View file @
914cc144
...
@@ -37,11 +37,6 @@ Defautls to 12.
...
@@ -37,11 +37,6 @@ Defautls to 12.
Number of replicates.
Number of replicates.
Defaults to 0 (no resilience).
Defaults to 0 (no resilience).
'verbose' (int, optional)
~~~~~~~~~~~~~~~~~~~~~~~~~
Non-zero to increase verbosity.
Defaults to 0.
'mysql-storage-count' (int, optional)
'mysql-storage-count' (int, optional)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Number of MySQL-based storage nodes to deploy. One master node is deployed
Number of MySQL-based storage nodes to deploy. One master node is deployed
...
...
software/neoppod/cluster.cfg.in
View file @
914cc144
...
@@ -19,10 +19,9 @@ partition-id = ${slap-connection:partition-id}
...
@@ -19,10 +19,9 @@ partition-id = ${slap-connection:partition-id}
config-cluster = {{ slapparameter_dict['cluster'] }}
config-cluster = {{ slapparameter_dict['cluster'] }}
config-partitions = {{ slapparameter_dict.get('partitions', 12) }}
config-partitions = {{ slapparameter_dict.get('partitions', 12) }}
config-replicas = {{ slapparameter_dict.get('replicas', 0) }}
config-replicas = {{ slapparameter_dict.get('replicas', 0) }}
config-verbose = {{ dumps(slapparameter_dict.get('verbose', 0)) }}
[request-config]
[request-config]
base = cluster
verbose
base = cluster
master = partitions replicas
master = partitions replicas
node = masters
node = masters
...
...
software/neoppod/instance-neo-admin.cfg.in
View file @
914cc144
...
@@ -16,7 +16,6 @@ ip = ${publish:ip}
...
@@ -16,7 +16,6 @@ ip = ${publish:ip}
port = ${publish:port}
port = ${publish:port}
cluster = ${slap-parameter:cluster}
cluster = ${slap-parameter:cluster}
masters = ${slap-parameter:masters}
masters = ${slap-parameter:masters}
verbose = ${slap-parameter:verbose}
[publish]
[publish]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
...
...
software/neoppod/instance-neo-master.cfg.in
View file @
914cc144
...
@@ -17,7 +17,6 @@ cluster = ${slap-parameter:cluster}
...
@@ -17,7 +17,6 @@ cluster = ${slap-parameter:cluster}
partitions = ${slap-parameter:partitions}
partitions = ${slap-parameter:partitions}
replicas = ${slap-parameter:replicas}
replicas = ${slap-parameter:replicas}
masters = ${slap-parameter:masters}
masters = ${slap-parameter:masters}
verbose = ${slap-parameter:verbose}
[publish]
[publish]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
...
...
software/neoppod/instance-neo-storage-mysql.cfg.in
View file @
914cc144
...
@@ -33,7 +33,6 @@ logfile = ${directory:log}/neostorage.log
...
@@ -33,7 +33,6 @@ logfile = ${directory:log}/neostorage.log
ip = [${slap-network-information:global-ipv6}]
ip = [${slap-network-information:global-ipv6}]
cluster = ${slap-parameter:cluster}
cluster = ${slap-parameter:cluster}
masters = ${slap-parameter:masters}
masters = ${slap-parameter:masters}
verbose = ${slap-parameter:verbose}
database-adapter = MySQL
database-adapter = MySQL
database-parameters = ${mariadb-instance:user}:${mariadb-instance:password}@${mariadb-instance:database}${mariadb-instance:socket}
database-parameters = ${mariadb-instance:user}:${mariadb-instance:password}@${mariadb-instance:database}${mariadb-instance:socket}
wait-database = 60
wait-database = 60
...
...
software/neoppod/software.cfg
View file @
914cc144
...
@@ -52,12 +52,12 @@ context =
...
@@ -52,12 +52,12 @@ context =
[template-neo-master]
[template-neo-master]
< = base-template
< = base-template
filename = instance-neo-master.cfg
filename = instance-neo-master.cfg
md5sum =
f43aaf52c4eb3665c8e8d22c447138e7
md5sum =
8947620b15535b95163c11a0efab546e
[template-neo-storage-mysql]
[template-neo-storage-mysql]
< = base-template
< = base-template
filename = instance-neo-storage-mysql.cfg
filename = instance-neo-storage-mysql.cfg
md5sum =
e767c66e7de58232de30bdf26188efe1
md5sum =
de3de33daf8a8be92b77c59eb92f61dd
extra-context =
extra-context =
key mariadb_location mariadb:location
key mariadb_location mariadb:location
key master_cfg template-neo-master:rendered
key master_cfg template-neo-master:rendered
...
@@ -65,12 +65,12 @@ extra-context =
...
@@ -65,12 +65,12 @@ extra-context =
[template-neo-admin]
[template-neo-admin]
< = base-template
< = base-template
filename = instance-neo-admin.cfg
filename = instance-neo-admin.cfg
md5sum =
c5bfa7ffbc71ab076694225402dcd74f
md5sum =
987f69333c563898cab21455509f8024
[template-cluster]
[template-cluster]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/cluster.cfg.in
url = ${:_profile_base_location_}/cluster.cfg.in
md5sum =
fe37b2ff36fee65b44945393f63e51c
3
md5sum =
7177d129e171b20044bf435ed549af4
3
[template-instance]
[template-instance]
< = base-template
< = base-template
...
...
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