NEO: new parameters to setup an external backup cluster

software/neoppod/cluster.cfg.in

@@ -21,6 +21,8 @@ config-masters = ${all-masters:addresses}
 < = request-common
 config-partitions = {{ dumps(slapparameter_dict.get('partitions', 12)) }}
 config-replicas = {{ dumps(slapparameter_dict.get('replicas', 0)) }}
+config-upstream-cluster = {{ dumps(slapparameter_dict.get('upstream-cluster', '')) }}
+config-upstream-masters = {{ dumps(slapparameter_dict.get('upstream-masters', '')) }}
 software-type = {{ mysql_storage_software_type }}
 
 [mysql-storage-request-base]

software/neoppod/instance-neo-master.cfg.in

@@ -14,6 +14,8 @@ port = ${publish:port}
 cluster = {{ dumps(slapparameter_dict['cluster']) }}
 partitions = {{ dumps(slapparameter_dict['partitions']) }}
 replicas = {{ dumps(slapparameter_dict['replicas']) }}
+upstream-cluster = {{ dumps(slapparameter_dict['upstream-cluster']) }}
+upstream-masters = {{ dumps(slapparameter_dict['upstream-masters']) }}
 # "masters" parameter is not provided when just requesting a partition.
 # No actuall installation takes place at that time
 # (slapos.cookbook:neoppod.master raises), but cfg expansion must succeed. So

software/neoppod/software.cfg

@@ -37,7 +37,7 @@ scripts =
 [cluster]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_buildout_section_name_}.cfg.in
-md5sum = bdb9d8d2b23916ef8b056698f3a56835
+md5sum = 85e88660335bbdfb13ba9026c24858b0
 
 [instance-neo-admin]
 < = cluster
@@ -45,7 +45,7 @@ md5sum = 43eb053841e9dabdbed2a3501a0a3f13
 
 [instance-neo-master]
 < = cluster
-md5sum = b1a8f2a3eda57a43dda67da5aec94e7a
+md5sum = 2cba73dbfa3f6e1a60d54de3bae38fee
 
 [instance-neo-storage-mysql]
 < = cluster