Commit 284b94b3 authored by Julien Muchembled's avatar Julien Muchembled

NEO: add support for cksumvfs

See neoppod@5923f8f5
parent a6d83fa2
...@@ -89,9 +89,17 @@ class NeoBaseRecipe(GenericBaseRecipe): ...@@ -89,9 +89,17 @@ class NeoBaseRecipe(GenericBaseRecipe):
) )
args += self._getOptionList() args += self._getOptionList()
args += shlex.split(options.get('extra-options', '')) args += shlex.split(options.get('extra-options', ''))
environment = {}
for line in (options.get('environment') or '').splitlines():
line = line.strip()
if line:
k, v = line.split('=', 1)
environment[k.rstrip()] = v.lstrip()
private_tmpfs = self.parsePrivateTmpfs() private_tmpfs = self.parsePrivateTmpfs()
kw = {'private_tmpfs': private_tmpfs} if private_tmpfs else {} kw = {'private_tmpfs': private_tmpfs} if private_tmpfs else {}
return self.createWrapper(options['wrapper'], args, **kw) return self.createWrapper(options['wrapper'], args, env=environment, **kw)
def _getBindingAddress(self): def _getBindingAddress(self):
options = self.options options = self.options
......
...@@ -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'))) }}
......
...@@ -86,6 +86,7 @@ context = ...@@ -86,6 +86,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
......
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