From 2b21b169bef75fc531ea9ab5d596b304a081d3a4 Mon Sep 17 00:00:00 2001 From: Administrator Date: Tue, 16 Aug 2022 10:06:15 +0300 Subject: [PATCH] infra --- .deploy/deploy-dev.yaml | 88 ++++++++++++++++------------------------ .deploy/deploy-prod.yaml | 88 ++++++++++++++++------------------------ Sprint/settings.py | 1 + SprintLib/queue.py | 5 ++- 4 files changed, 77 insertions(+), 105 deletions(-) diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml index 03ec0fd..c161c2c 100644 --- a/.deploy/deploy-dev.yaml +++ b/.deploy/deploy-dev.yaml @@ -22,34 +22,6 @@ services: parallelism: 1 order: start-first - rabbitmq: - image: rabbitmq:3.7.9-management - networks: - - net - deploy: - mode: replicated - restart_policy: - condition: any - placement: - constraints: [node.role == manager] - update_config: - parallelism: 1 - order: start-first - - redis: - image: redis - networks: - - net - deploy: - mode: replicated - restart_policy: - condition: any - placement: - constraints: [node.role == manager] - update_config: - parallelism: 1 - order: start-first - migrations: image: mathwave/sprint-repo:sprint command: ./manage.py migrate @@ -58,8 +30,9 @@ services: environment: DB_HOST: "pg.develop.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" + REDIS_HOST: "redis.develop.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -75,8 +48,9 @@ services: environment: DB_HOST: "pg.develop.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" + REDIS_HOST: "redis.develop.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -99,8 +73,9 @@ services: environment: DB_HOST: "pg.develop.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" + REDIS_HOST: "redis.develop.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -121,8 +96,9 @@ services: environment: DB_HOST: "pg.develop.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" + REDIS_HOST: "redis.develop.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -145,8 +121,9 @@ services: environment: DB_HOST: "pg.develop.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" + REDIS_HOST: "redis.develop.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -166,8 +143,9 @@ services: environment: DB_HOST: "pg.develop.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" + REDIS_HOST: "redis.develop.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -188,8 +166,9 @@ services: environment: DB_HOST: "pg.develop.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" + REDIS_HOST: "redis.develop.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -213,8 +192,9 @@ services: environment: DB_HOST: "pg.develop.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" + REDIS_HOST: "redis.develop.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -235,8 +215,9 @@ services: environment: DB_HOST: "pg.develop.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" + REDIS_HOST: "redis.develop.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -257,8 +238,9 @@ services: environment: DB_HOST: "pg.develop.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" + REDIS_HOST: "redis.develop.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -279,8 +261,9 @@ services: environment: DB_HOST: "pg.develop.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" + REDIS_HOST: "redis.develop.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG EMAIL_PASSWORD: $EMAIL_PASSWORD @@ -301,8 +284,9 @@ services: environment: DB_HOST: "pg.develop.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" + REDIS_HOST: "redis.develop.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml index fca2004..7274036 100644 --- a/.deploy/deploy-prod.yaml +++ b/.deploy/deploy-prod.yaml @@ -22,34 +22,6 @@ services: parallelism: 1 order: start-first - rabbitmq: - image: rabbitmq:3.7.9-management - networks: - - net - deploy: - mode: replicated - restart_policy: - condition: any - placement: - constraints: [node.role == manager] - update_config: - parallelism: 1 - order: start-first - - redis: - image: redis - networks: - - net - deploy: - mode: replicated - restart_policy: - condition: any - placement: - constraints: [node.role == manager] - update_config: - parallelism: 1 - order: start-first - storage: image: mathwave/sprint-repo:sprint networks: @@ -58,8 +30,9 @@ services: environment: DB_HOST: "pg.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.sprinthub.ru" + REDIS_HOST: "redis.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -84,8 +57,9 @@ services: environment: DB_HOST: "pg.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.sprinthub.ru" + REDIS_HOST: "redis.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -103,8 +77,9 @@ services: environment: DB_HOST: "pg.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.sprinthub.ru" + REDIS_HOST: "redis.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -122,8 +97,9 @@ services: environment: DB_HOST: "pg.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.sprinthub.ru" + REDIS_HOST: "redis.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -148,8 +124,9 @@ services: environment: DB_HOST: "pg.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.sprinthub.ru" + REDIS_HOST: "redis.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -171,8 +148,9 @@ services: environment: DB_HOST: "pg.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.sprinthub.ru" + REDIS_HOST: "redis.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -194,8 +172,9 @@ services: environment: DB_HOST: "pg.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.sprinthub.ru" + REDIS_HOST: "redis.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -217,8 +196,9 @@ services: environment: DB_HOST: "pg.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.sprinthub.ru" + REDIS_HOST: "redis.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -243,8 +223,9 @@ services: environment: DB_HOST: "pg.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.sprinthub.ru" + REDIS_HOST: "redis.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -266,8 +247,9 @@ services: environment: DB_HOST: "pg.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.sprinthub.ru" + REDIS_HOST: "redis.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -289,8 +271,9 @@ services: environment: DB_HOST: "pg.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.sprinthub.ru" + REDIS_HOST: "redis.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -312,8 +295,9 @@ services: environment: DB_HOST: "pg.sprinthub.ru" FS_HOST: "storage" - RABBIT_HOST: "rabbitmq" - REDIS_HOST: "redis" + RABBIT_HOST: "rabbitmq.sprinthub.ru" + REDIS_HOST: "redis.sprinthub.ru" + RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG EMAIL_PASSWORD: $EMAIL_PASSWORD diff --git a/Sprint/settings.py b/Sprint/settings.py index da612b6..b236c5c 100644 --- a/Sprint/settings.py +++ b/Sprint/settings.py @@ -143,6 +143,7 @@ for root in DATA_ROOT, EXTRA_FILES_ROOT: RABBIT_HOST = os.getenv("RABBIT_HOST", "127.0.0.1") RABBIT_PORT = 5672 +RABBIT_PASSWORD = os.getenv("RABBIT_PASSWORD", "guest") FS_HOST = "http://" + os.getenv("FS_HOST", "127.0.0.1") FS_PORT = 5555 diff --git a/SprintLib/queue.py b/SprintLib/queue.py index 31911a2..5154560 100644 --- a/SprintLib/queue.py +++ b/SprintLib/queue.py @@ -48,7 +48,10 @@ class MessagingSupport(BaseCommand): while True: try: with pika.BlockingConnection( - pika.ConnectionParameters(host=settings.RABBIT_HOST) + pika.ConnectionParameters( + host=settings.RABBIT_HOST, + credentials=pika.PlainCredentials('guest', settings.RABBIT_PASSWORD) + ) ) as connection: channel = connection.channel() channel.queue_declare(queue=self.queue_name)