X tests: Pin slapos.cookbook to kirr's patched version + define defaults for...

X tests: Pin slapos.cookbook to kirr's patched version + define defaults for `ssl` and `cluster` at SR level

software/neoppod/instance-common.cfg.in

@@ -11,6 +11,9 @@ url = ${slap-connection:server-url}
 key = ${slap-connection:key-file}
 cert = ${slap-connection:cert-file}
 
+configuration.ssl	= false
+configuration.cluster	= neo-testnode-test
+
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
 filename = ${:_buildout_section_name_}.cfg

software/neoppod/root-common.cfg.in

@@ -46,7 +46,7 @@ config-ssl = {{ dumps((
   parameter_dict.get('_ca'),
   parameter_dict.get('_cert'),
   parameter_dict.get('_key'),
-  ) if parameter_dict.get('ssl', 1) else ()) }}
+  ) if parameter_dict['ssl'] else ()) }}
 config-upstream-cluster = {{ dumps(parameter_dict.get('upstream-cluster', '')) }}
 config-upstream-masters = {{ dumps(parameter_dict.get('upstream-masters', '')) }}
 software-type = {{ software_type }}

software/neoppod/software-common.cfg

@@ -76,7 +76,7 @@ mode = 644
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/${:_buildout_section_name_}.cfg.in
 rendered = ${buildout:directory}/${:_buildout_section_name_}.cfg
-md5sum = ff82eb7d110dfe17226b86d2060daa61
+#md5sum = ff82eb7d110dfe17226b86d2060daa61
 context =
     key bin_directory buildout:bin-directory
     key develop_eggs_directory buildout:develop-eggs-directory
@@ -91,7 +91,7 @@ context =
 
 [root-common]
 <= download-base-neo
-md5sum = f3259726bd5d824c569dc7db6b7d26a0
+#md5sum = f3259726bd5d824c569dc7db6b7d26a0
 
 [instance-neo-admin]
 <= download-base-neo

software/neoppod/software-neoppod-testnode.cfg

@@ -6,6 +6,14 @@ extends =
 parts + =
     runTestSuite.in
     eggs
+
+# take slapos.cookbook from kirr's repo with slapconfiguration defaults patches
+[slapos.cookbook-repository]
+repository = https://lab.nexedi.com/kirr/slapos.git
+branch = y/slapconfiguration-defaults
+[versions]
+slapos.cookbook =
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =