From 956d3d17e2ccd8287c7da14415d38e4916703af4 Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Tue, 3 May 2022 17:37:29 +0200 Subject: [PATCH] new: [monujo] make relation to ``odoo-server`` optional Signed-off-by: Valentin Lab --- monujo/hooks/pre_deploy | 24 +++++++++++++----------- monujo/metadata.yml | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/monujo/hooks/pre_deploy b/monujo/hooks/pre_deploy index 6290966..7a5e8c4 100755 --- a/monujo/hooks/pre_deploy +++ b/monujo/hooks/pre_deploy @@ -5,19 +5,21 @@ set -e -if ! url=$(relation:get "${SERVICE_NAME}":odoo-server:web-proxy url); then - err "Monujo doesn't support odoo-server not having a web-proxy yet." - exit 1 -fi -if ! dbname=$(relation:get "${SERVICE_NAME}":odoo-server:postgres-database dbname); then - err "Can't find db name of our odoo-server relation." - exit 1 +if service:traverse "${SERVICE_NAME}":odoo-server >/dev/null; then + if ! url=$(relation:get "${SERVICE_NAME}":odoo-server:web-proxy url); then + err "Monujo doesn't support odoo-server not having a web-proxy yet." + exit 1 + fi + if ! dbname=$(relation:get "${SERVICE_NAME}":odoo-server:postgres-database dbname); then + err "Can't find db name of our odoo-server relation." + exit 1 + fi + monujo:config_merge "{ + \"lokapiHost\": \"$url\", + \"lokapiDb\": \"$dbname\" + }" fi -monujo:config_merge "{ - \"lokapiHost\": \"$url\", - \"lokapiDb\": \"$dbname\" -}" if map_url=$(relation:get "${SERVICE_NAME}":map-server:publish-dir url); then diff --git a/monujo/metadata.yml b/monujo/metadata.yml index 740e038..c9de2be 100644 --- a/monujo/metadata.yml +++ b/monujo/metadata.yml @@ -18,7 +18,7 @@ uses: odoo-server: #constraint: required | recommended | optional #auto: pair | summon | none ## default: pair - constraint: required + constraint: optional auto: pair solves: container: "LCC API provider"