From d6b072df4669b62538cd67799e94751a8a9731db Mon Sep 17 00:00:00 2001 From: Timor Morrien Date: Fri, 2 Feb 2024 17:37:22 +0100 Subject: [PATCH] Fix config --- roles/artemis/templates/application-prod.yml.j2 | 5 +++-- roles/artemis/templates/artemis.env.j2 | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/artemis/templates/application-prod.yml.j2 b/roles/artemis/templates/application-prod.yml.j2 index eeb6829..6a7144a 100644 --- a/roles/artemis/templates/application-prod.yml.j2 +++ b/roles/artemis/templates/application-prod.yml.j2 @@ -186,10 +186,11 @@ artemis: {% endif %} {% if continuous_integration.hades is defined %} - hades: - url: {{ continuous_integration.hades.url }} + continuous-integration: token: {{ continuous_integration.hades.token }} + hades: + url: {{ continuous_integration.hades.url }} images: clone-image: {{ continuous_integration.hades.clone_image }} result-image: {{ continuous_integration.hades.result_image }} diff --git a/roles/artemis/templates/artemis.env.j2 b/roles/artemis/templates/artemis.env.j2 index 399cd54..1b313bb 100644 --- a/roles/artemis/templates/artemis.env.j2 +++ b/roles/artemis/templates/artemis.env.j2 @@ -140,8 +140,9 @@ ARTEMIS_CONTINUOUSINTEGRATION_ARTEMISAUTHENTICATIONTOKENVALUE='demo' ARTEMIS_CONTINUOUSINTEGRATION_DOCKERCONNECTIONURI='unix:///var/run/docker.sock' {% endif %} {% if continuous_integration.hades is defined %} +ARTEMIS_CONTINUOUSINTEGRATION_ARTEMISAUTHENTICATIONTOKENVALUE='demo' ARTEMIS_HADES_URL='{{ continuous_integration.hades.url }}' -ARTEMIS_HADES_TOKEN='{{ continuous_integration.hades.token }}' +ARTEMIS_CONTINUOUSINTEGRATION_TOKEN='{{ continuous_integration.hades.token }}' ARTEMIS_HADES_CLONEIMAGE='{{ continuous_integration.hades.clone_image }}' ARTEMIS_HADES_RESULTIMAGE='{{ continuous_integration.hades.result_image }}' {% endif %}