Skip to content

Commit 2ef35df

Browse files
Merge branch 'master' into fix-cluster-keeper-task-interval-env-var
2 parents e3800d4 + 5c8b32a commit 2ef35df

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

services/director-v2/tests/unit/with_dbs/test_modules_comp_scheduler_dask_scheduler.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,9 @@ class RebootState:
11751175
expected_run_state: RunningState
11761176

11771177

1178+
@pytest.mark.skip(
1179+
reason="awaiting refactor in https://github.com/ITISFoundation/osparc-simcore/pull/6736"
1180+
)
11781181
@pytest.mark.parametrize(
11791182
"reboot_state",
11801183
[

services/director/src/simcore_service_director/producer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ async def _create_docker_service_params(
178178
service_name = registry_proxy.get_service_last_names(service_key) + "_" + node_uuid
179179
_logger.debug("Converting labels to docker runtime parameters")
180180
service_default_envs = {
181-
"POSTGRES_ENDPOINT": app_settings.DIRECTOR_POSTGRES.dsn,
181+
# old services expect POSTGRES_ENDPOINT as hostname:port
182+
"POSTGRES_ENDPOINT": f"{app_settings.DIRECTOR_POSTGRES.POSTGRES_HOST}:{app_settings.DIRECTOR_POSTGRES.POSTGRES_PORT}",
182183
"POSTGRES_USER": app_settings.DIRECTOR_POSTGRES.POSTGRES_USER,
183184
"POSTGRES_PASSWORD": app_settings.DIRECTOR_POSTGRES.POSTGRES_PASSWORD.get_secret_value(),
184185
"POSTGRES_DB": app_settings.DIRECTOR_POSTGRES.POSTGRES_DB,

0 commit comments

Comments
 (0)