NEO: add support for the --disable-pack option

slapos/recipe/neoppod.py

@@ -128,10 +128,6 @@ class Storage(NeoBaseRecipe):
     engine = self.options.get('engine')
     if engine: # old versions of NEO don't support -e
       r  += '-e', engine
-    if self.options.get('dedup'):
-      r.append('--dedup')
-    if self.options.get('disable-drop-partitions'):
-      r.append('--disable-drop-partitions')
     return r
 
 class Admin(NeoBaseRecipe):

software/neoppod/buildout.hash.cfg

@@ -30,7 +30,7 @@ md5sum = 9f27195d770b2f57461c60a82c851ab9
 
 [instance-neo]
 filename = instance-neo.cfg.in
-md5sum = 9bfb9e94363d63b801b29e559b7a0c8d
+md5sum = 53b2c73a0c5c7cb5f6b841ba6892fa46
 
 [template-neo-my-cnf]
 filename = my.cnf.in

software/neoppod/instance-neo-input-schema.json

@@ -110,6 +110,11 @@
               "default": false,
               "type": "boolean"
             },
+            "disable-pack": {
+              "description": "Set the --disable-pack option for storage nodes.",
+              "default": false,
+              "type": "boolean"
+            },
             "private-tmpfs": {
               "description": "Size of private tmpfs mount to store the database. See filesystems/tmpfs.txt in Linux documentation. Use only for testing.",
               "type": "string"

software/neoppod/instance-neo.cfg.in

@@ -151,8 +151,16 @@ engine = ${my-cnf-parameters:engine}
 environment =
   PATH={{sqlite3_location}}/bin
 {%- endif %}
-dedup = {{ dumps(bool(slapparameter_dict.get('data-deduplication'))) }}
-disable-drop-partitions = {{ dumps(bool(slapparameter_dict.get('disable-drop-partitions'))) }}
+extra-options =
+{%- if slapparameter_dict.get('data-deduplication') %}
+  --dedup
+{%- endif %}
+{%- if slapparameter_dict.get('disable-drop-partitions') %}
+  --disable-drop-partitions
+{%- endif %}
+{%- if slapparameter_dict.get('disable-pack') %}
+  --disable-pack
+{%- endif %}
 
 {% for i in range(storage_count) -%}
 {%   set storage_id = 'neo-storage-' ~ i -%}