From ad9ea4eefa9929e03e35c3231aa49b96f0b5ddb5 Mon Sep 17 00:00:00 2001
From: Georgy Poputnikov <georgy.poputnikov@r1.team>
Date: Sun, 17 Jul 2022 17:43:02 +0300
Subject: [PATCH] fix: default value for vhost

---
 engine/settings/helm.py        | 4 ++--
 helm/oncall/templates/_env.tpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engine/settings/helm.py b/engine/settings/helm.py
index 94b65e46..9683207b 100644
--- a/engine/settings/helm.py
+++ b/engine/settings/helm.py
@@ -27,9 +27,9 @@ RABBITMQ_PASSWORD = os.environ.get("RABBITMQ_PASSWORD")
 RABBITMQ_HOST = os.environ.get("RABBITMQ_HOST")
 RABBITMQ_PORT = os.environ.get("RABBITMQ_PORT")
 RABBITMQ_PROTOCOL = os.environ.get("RABBITMQ_PROTOCOL")
-RABBITMQ_VHOST = os.environ.get("RABBITMQ_VHOST", "/")
+RABBITMQ_VHOST = os.environ.get("RABBITMQ_VHOST", "")
 
-CELERY_BROKER_URL = f"{RABBITMQ_PROTOCOL}://{RABBITMQ_USERNAME}:{RABBITMQ_PASSWORD}@{RABBITMQ_HOST}:{RABBITMQ_PORT}{RABBITMQ_VHOST}"
+CELERY_BROKER_URL = f"{RABBITMQ_PROTOCOL}://{RABBITMQ_USERNAME}:{RABBITMQ_PASSWORD}@{RABBITMQ_HOST}:{RABBITMQ_PORT}/{RABBITMQ_VHOST}"
 
 REDIS_PASSWORD = os.environ.get("REDIS_PASSWORD")
 REDIS_HOST = os.environ.get("REDIS_HOST")
diff --git a/helm/oncall/templates/_env.tpl b/helm/oncall/templates/_env.tpl
index cd36cfd3..b1769b83 100644
--- a/helm/oncall/templates/_env.tpl
+++ b/helm/oncall/templates/_env.tpl
@@ -146,7 +146,7 @@
 {{- if and (not .Values.rabbitmq.enabled) .Values.externalRabbitmq.vhost -}}
 {{ .Values.externalRabbitmq.vhost | quote }}
 {{- else -}}
-"/"
+""
 {{- end -}}
 {{- end -}}