From 9d4a35b8ca799f468ad1aa0f10ba3846e60830a7 Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Wed, 4 Dec 2019 14:19:25 +0100 Subject: [PATCH] new: [odoo-tecnativa] added 'modules' option to charm. Signed-off-by: Valentin Lab --- odoo-tecnativa/hooks/init | 10 +++++++++- odoo-tecnativa/hooks/postgres_database-relation-joined | 1 - odoo-tecnativa/metadata.yml | 5 +++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/odoo-tecnativa/hooks/init b/odoo-tecnativa/hooks/init index e208b4b..8553463 100755 --- a/odoo-tecnativa/hooks/init +++ b/odoo-tecnativa/hooks/init @@ -26,11 +26,19 @@ find "$LIB" \! -user "$odoo_uid" -print0 | while read-0 f; do done ## workers management -workers=$(options-get workers 2>&1) || true +workers=$(options-get workers 2>/dev/null) || true workers=${workers:-1} +modules=$(options-get modules 2>/dev/null | yaml_get_values ,) || true +if [ -z "$modules" ]; then + modules=base,l10n_fr +else + modules="base,${modules}" +fi + init-config-add " $SERVICE_NAME: command: - \"--workers=${workers}\" + - \"-i ${modules}\" " diff --git a/odoo-tecnativa/hooks/postgres_database-relation-joined b/odoo-tecnativa/hooks/postgres_database-relation-joined index 95a8871..3533ec9 100755 --- a/odoo-tecnativa/hooks/postgres_database-relation-joined +++ b/odoo-tecnativa/hooks/postgres_database-relation-joined @@ -30,7 +30,6 @@ config-add "\ services: $MASTER_BASE_SERVICE_NAME: command: - - '-i base,l10n_fr' - '--database=$DBNAME' ## All this is to please technativa image, but is quite redundant environment: diff --git a/odoo-tecnativa/metadata.yml b/odoo-tecnativa/metadata.yml index f8c3a7a..631f59e 100644 --- a/odoo-tecnativa/metadata.yml +++ b/odoo-tecnativa/metadata.yml @@ -16,6 +16,11 @@ docker-compose: INITIAL_LANG: fr_FR LIST_DB: 'true' +default-options: + workers: 1 + # modules: + # - l10n_fr + #database: MYDATABASE ## will be the one connected to postgres uses: postgres-database: #constraint: required | recommended | optional