Skip to content

slapos
slapos
Commit c85e3b0c authored by Julien Muchembled's avatar Julien Muchembled
Browse files
Options

fixup! NEO: only load MariaDB plugin for chosen engine 

Commit d0df63cf broke support for SQLite.
parent c6f03e4e
Pipeline #6871 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 3 additions and 1 deletion
    software/neoppod/buildout.hash.cfg
    View file @ c85e3b0c
    ...@@ -30,7 +30,7 @@ md5sum = 9f27195d770b2f57461c60a82c851ab9 ...@@ -30,7 +30,7 @@ md5sum = 9f27195d770b2f57461c60a82c851ab9
    [instance-neo] [instance-neo]
    filename = instance-neo.cfg.in filename = instance-neo.cfg.in
    md5sum = d18e049d580720e733502b774b0d6790 md5sum = 574acb0cae9af8ec2af52825fb2436d8
    [template-neo-my-cnf] [template-neo-my-cnf]
    filename = my.cnf.in filename = my.cnf.in
    ......
    software/neoppod/instance-neo.cfg.in
    View file @ c85e3b0c
    ...@@ -90,7 +90,9 @@ cluster = {{ dumps(slapparameter_dict['cluster']) }} ...@@ -90,7 +90,9 @@ cluster = {{ dumps(slapparameter_dict['cluster']) }}
    masters = {{ dumps(slapparameter_dict['masters']) }} masters = {{ dumps(slapparameter_dict['masters']) }}
    database-adapter = {{ storage_type }} database-adapter = {{ storage_type }}
    wait-database = -1 wait-database = -1
    {%- if mysql %}
    engine = ${my-cnf-parameters:engine} engine = ${my-cnf-parameters:engine}
    {%- endif %}
    dedup = {{ dumps(bool(slapparameter_dict.get('data-deduplication'))) }} dedup = {{ dumps(bool(slapparameter_dict.get('data-deduplication'))) }}
    disable-drop-partitions = {{ dumps(bool(slapparameter_dict.get('disable-drop-partitions'))) }} disable-drop-partitions = {{ dumps(bool(slapparameter_dict.get('disable-drop-partitions'))) }}
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7