Merge branch 'master' into fix-cluster-keeper-task-interval-env-var

ITISFoundation · Nov 22, 2024 · 2ef35df · 2ef35df
2 parents e3800d4 + 5c8b32a
commit 2ef35df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -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
@@ -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,