software/neoppod: Backup automatically

When upstream-cluster and upstream-masters are given, also pass --backup
to the neo master so that it converges automatically to BACKINGUP state.

software/neoppod/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = b6e1ccb1d90160110202e5111eec2afa
 
 [instance-neo-master]
 filename = instance-neo-master.cfg.in
-md5sum = 9f27195d770b2f57461c60a82c851ab9
+md5sum = 710dedc7cf018ffd1af1743fe7b878cb
 
 [instance-neo]
 filename = instance-neo.cfg.in

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

 {%- if slapparameter_dict.get('master') != 0 %}
+
 [buildout]
 parts +=
   logrotate-master
@@ -17,6 +18,9 @@ replicas = {{ slapparameter_dict['replicas'] }}
 upstream-cluster = {{ dumps(slapparameter_dict['upstream-cluster']) }}
 upstream-masters = {{ dumps(slapparameter_dict['upstream-masters']) }}
 autostart = {{ slapparameter_dict['autostart'] }}
+{%- if slapparameter_dict['upstream-cluster'] %}
+extra-options = -B
+{%- endif %}
 # "masters" parameter is not provided when just requesting a partition.
 # No actual installation takes place at that time
 # (slapos.cookbook:neoppod.master raises), but cfg expansion must succeed. So