Commit b33de79e authored by Julien Muchembled's avatar Julien Muchembled

NEO: add support for cksumvfs

This is a follow-up of 7a1ba8df.
parent 67e40978
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[instance-common] [instance-common]
filename = instance-common.cfg.in filename = instance-common.cfg.in
md5sum = ecc98da90cd446ea224ddeece1374190 md5sum = b4baf7f21f450fa522c2a69f5a4aedf7
[root-common] [root-common]
filename = root-common.cfg.in filename = root-common.cfg.in
...@@ -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 = 200ae55715cb735b0f97f8c835a3071f md5sum = bc647a29f9d6ece2e4117ce8f04d27c5
[template-neo-my-cnf] [template-neo-my-cnf]
filename = my.cnf.in filename = my.cnf.in
......
...@@ -44,6 +44,7 @@ extra-context = ...@@ -44,6 +44,7 @@ extra-context =
import urllib urllib import urllib urllib
key master_cfg neo-master:output key master_cfg neo-master:output
key admin_cfg neo-admin:output key admin_cfg neo-admin:output
raw sqlite3_location {{ sqlite3_location }}
{%- if mariadb_location is defined %} {%- if mariadb_location is defined %}
raw mariadb_location {{ mariadb_location }} raw mariadb_location {{ mariadb_location }}
raw template_mysqld_wrapper {{ template_mysqld_wrapper }} raw template_mysqld_wrapper {{ template_mysqld_wrapper }}
......
...@@ -144,6 +144,9 @@ database-adapter = {{ storage_type }} ...@@ -144,6 +144,9 @@ database-adapter = {{ storage_type }}
wait-database = -1 wait-database = -1
{%- if mysql %} {%- if mysql %}
engine = ${my-cnf-parameters:engine} engine = ${my-cnf-parameters:engine}
{%- else %}
environment =
PATH={{sqlite3_location}}/bin
{%- endif %} {%- 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'))) }}
......
...@@ -89,6 +89,7 @@ context = ...@@ -89,6 +89,7 @@ context =
key neo instance-neo:target key neo instance-neo:target
key template_logrotate_base template-logrotate-base:output key template_logrotate_base template-logrotate-base:output
key template_monitor monitor2-template:output key template_monitor monitor2-template:output
key sqlite3_location sqlite3:location
${:adapter-context} ${:adapter-context}
adapter-context = adapter-context =
key mariadb_location mariadb:location key mariadb_location mariadb:location
......
...@@ -307,7 +307,7 @@ sgmllib3k = 1.0.0 ...@@ -307,7 +307,7 @@ sgmllib3k = 1.0.0
simplegeneric = 0.8.1 simplegeneric = 0.8.1
singledispatch = 3.4.0.3 singledispatch = 3.4.0.3
six = 1.16.0 six = 1.16.0
slapos.cookbook = 1.0.351 slapos.cookbook = 1.0.360
slapos.core = 1.11.0 slapos.core = 1.11.0
slapos.extension.shared = 1.0 slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.25 slapos.libnetworkcache = 0.25
......
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