fixup! NEO: only load MariaDB plugin for chosen engine

Commit d0df63cf broke support for SQLite.

fixup! NEO: only load MariaDB plugin for chosen engine
Commit d0df63cf broke support for SQLite.
c85e3b0c · Julien Muchembled · c6f03e4e · c85e3b0c · c85e3b0c
Commit c85e3b0c authored Nov 28, 2019 by Julien Muchembled
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

software/neoppod/buildout.hash.cfg software/neoppod/buildout.hash.cfg +1 -1

software/neoppod/instance-neo.cfg.in software/neoppod/instance-neo.cfg.in +2 -0

No files found.
--- a/software/neoppod/buildout.hash.cfg
+++ b/software/neoppod/buildout.hash.cfg
@@ -30,7 +30,7 @@ md5sum = 9f27195d770b2f57461c60a82c851ab9

 [instance-neo]
 filename = instance-neo.cfg.in
-md5sum = d18e049d580720e733502b774b0d6790
+md5sum = 574acb0cae9af8ec2af52825fb2436d8

 [template-neo-my-cnf]
 filename = my.cnf.in

--- a/software/neoppod/instance-neo.cfg.in
+++ b/software/neoppod/instance-neo.cfg.in
@@ -90,7 +90,9 @@ cluster = {{ dumps(slapparameter_dict['cluster']) }}
 masters = {{ dumps(slapparameter_dict['masters']) }}
 database-adapter = {{ storage_type }}
 wait-database = -1
+{%- if mysql %}
 engine = ${my-cnf-parameters:engine}
+{%- endif %}
 dedup = {{ dumps(bool(slapparameter_dict.get('data-deduplication'))) }}
 disable-drop-partitions = {{ dumps(bool(slapparameter_dict.get('disable-drop-partitions'))) }}