Skip to content

Commit 40ca0ee

Browse files
committed
added setting for primary machine
1 parent 70409d2 commit 40ca0ee

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

services/clusters-keeper/src/simcore_service_clusters_keeper/core/settings.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,14 @@ class PrimaryEC2InstancesSettings(BaseCustomSettings):
252252
),
253253
] = "172.20.0.0/14" # nosec
254254

255+
PRIMARY_EC2_INSTANCES_RABBIT_SETTINGS: Annotated[
256+
RabbitSettings | None,
257+
Field(
258+
description="defines the Rabbit settings for the primary instance (may be disabled)",
259+
json_schema_extra={"auto_default_from_env": True},
260+
),
261+
]
262+
255263
@field_validator("PRIMARY_EC2_INSTANCES_ALLOWED_TYPES")
256264
@classmethod
257265
def _check_valid_instance_names(

services/clusters-keeper/src/simcore_service_clusters_keeper/data/docker-compose.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,11 @@ services:
106106
EC2_INSTANCES_TIME_BEFORE_TERMINATION: ${WORKERS_EC2_INSTANCES_TIME_BEFORE_TERMINATION}
107107
LOG_FORMAT_LOCAL_DEV_ENABLED: 1
108108
LOG_LEVEL: ${LOG_LEVEL:-WARNING}
109+
RABBIT_HOST: ${RABBIT_HOST}
110+
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
111+
RABBIT_PORT: ${RABBIT_PORT}
112+
RABBIT_SECURE: ${RABBIT_SECURE}
113+
RABBIT_USER: ${RABBIT_USER}
109114
REDIS_HOST: redis
110115
REDIS_PORT: 6379
111116
volumes:
@@ -188,6 +193,7 @@ services:
188193
networks:
189194
cluster:
190195

196+
191197
configs:
192198
prometheus-config:
193199
file: ./prometheus.yml
@@ -200,6 +206,7 @@ volumes:
200206
redis-data:
201207
prometheus-data:
202208

209+
203210
secrets:
204211
dask_tls_ca:
205212
file: ${DASK_TLS_CA_FILE}

0 commit comments

Comments
 (0)