From 5c8b32ab921c1a8dcaa85918089af43cc9f6d375 Mon Sep 17 00:00:00 2001 From: Sylvain <35365065+sanderegg@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:20:05 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9BDirector-V0:=20Legacy=20services=20?= =?UTF-8?q?expect=20Postgres=20Endpoint=20as=20host:port=20(#6811)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../with_dbs/test_modules_comp_scheduler_dask_scheduler.py | 3 +++ services/director/src/simcore_service_director/producer.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/services/director-v2/tests/unit/with_dbs/test_modules_comp_scheduler_dask_scheduler.py b/services/director-v2/tests/unit/with_dbs/test_modules_comp_scheduler_dask_scheduler.py index 8fbc2d9006b..18a992e3db7 100644 --- a/services/director-v2/tests/unit/with_dbs/test_modules_comp_scheduler_dask_scheduler.py +++ b/services/director-v2/tests/unit/with_dbs/test_modules_comp_scheduler_dask_scheduler.py @@ -1175,6 +1175,9 @@ class RebootState: expected_run_state: RunningState +@pytest.mark.skip( + reason="awaiting refactor in https://github.com/ITISFoundation/osparc-simcore/pull/6736" +) @pytest.mark.parametrize( "reboot_state", [ diff --git a/services/director/src/simcore_service_director/producer.py b/services/director/src/simcore_service_director/producer.py index 79e695ead57..907e7a8e04e 100644 --- a/services/director/src/simcore_service_director/producer.py +++ b/services/director/src/simcore_service_director/producer.py @@ -178,7 +178,8 @@ async def _create_docker_service_params( service_name = registry_proxy.get_service_last_names(service_key) + "_" + node_uuid _logger.debug("Converting labels to docker runtime parameters") service_default_envs = { - "POSTGRES_ENDPOINT": app_settings.DIRECTOR_POSTGRES.dsn, + # old services expect POSTGRES_ENDPOINT as hostname:port + "POSTGRES_ENDPOINT": f"{app_settings.DIRECTOR_POSTGRES.POSTGRES_HOST}:{app_settings.DIRECTOR_POSTGRES.POSTGRES_PORT}", "POSTGRES_USER": app_settings.DIRECTOR_POSTGRES.POSTGRES_USER, "POSTGRES_PASSWORD": app_settings.DIRECTOR_POSTGRES.POSTGRES_PASSWORD.get_secret_value(), "POSTGRES_DB": app_settings.DIRECTOR_POSTGRES.POSTGRES_DB,