Commit d2940e88 authored by Julien Muchembled's avatar Julien Muchembled

NEO: missing dumps and duplicated default values

parent a2ba55e0
...@@ -11,7 +11,7 @@ key-file = ${slap-connection:key-file} ...@@ -11,7 +11,7 @@ key-file = ${slap-connection:key-file}
cert-file = ${slap-connection:cert-file} cert-file = ${slap-connection:cert-file}
computer-id = ${slap-connection:computer-id} computer-id = ${slap-connection:computer-id}
partition-id = ${slap-connection:partition-id} partition-id = ${slap-connection:partition-id}
config-cluster = {{ slapparameter_dict['cluster'] }} config-cluster = {{ dumps(slapparameter_dict['cluster']) }}
[node-base] [node-base]
< = request-common < = request-common
...@@ -19,8 +19,8 @@ config-masters = ${all-masters:addresses} ...@@ -19,8 +19,8 @@ config-masters = ${all-masters:addresses}
[mysql-storage-base] [mysql-storage-base]
< = request-common < = request-common
config-partitions = {{ slapparameter_dict.get('partitions', 12) }} config-partitions = {{ dumps(slapparameter_dict.get('partitions', 12)) }}
config-replicas = {{ slapparameter_dict.get('replicas', 0) }} config-replicas = {{ dumps(slapparameter_dict.get('replicas', 0)) }}
software-type = {{ mysql_storage_software_type }} software-type = {{ mysql_storage_software_type }}
[mysql-storage-request-base] [mysql-storage-request-base]
......
...@@ -12,8 +12,8 @@ logfile = ${directory:log}/neomaster.log ...@@ -12,8 +12,8 @@ logfile = ${directory:log}/neomaster.log
ip = ${publish:ip} ip = ${publish:ip}
port = ${publish:port} port = ${publish:port}
cluster = {{ dumps(slapparameter_dict['cluster']) }} cluster = {{ dumps(slapparameter_dict['cluster']) }}
partitions = {{ dumps(slapparameter_dict.get('partitions', 12)) }} partitions = {{ dumps(slapparameter_dict['partitions']) }}
replicas = {{ dumps(slapparameter_dict.get('replicas', 0)) }} replicas = {{ dumps(slapparameter_dict['replicas']) }}
# "masters" parameter is not provided when just requesting a partition. # "masters" parameter is not provided when just requesting a partition.
# No actuall installation takes place at that time # No actuall 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
......
...@@ -37,7 +37,7 @@ scripts = ...@@ -37,7 +37,7 @@ scripts =
[cluster] [cluster]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:_buildout_section_name_}.cfg.in url = ${:_profile_base_location_}/${:_buildout_section_name_}.cfg.in
md5sum = 3939e229108f96ac0d68224fc1630880 md5sum = bdb9d8d2b23916ef8b056698f3a56835
[instance-neo-admin] [instance-neo-admin]
< = cluster < = cluster
...@@ -45,7 +45,7 @@ md5sum = 43eb053841e9dabdbed2a3501a0a3f13 ...@@ -45,7 +45,7 @@ md5sum = 43eb053841e9dabdbed2a3501a0a3f13
[instance-neo-master] [instance-neo-master]
< = cluster < = cluster
md5sum = 25724ba46203c57b680976dbe4ba67b7 md5sum = b1a8f2a3eda57a43dda67da5aec94e7a
[instance-neo-storage-mysql] [instance-neo-storage-mysql]
< = cluster < = cluster
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment