From d31e2725b8030c68b97b357fe4de07e2408ab00b Mon Sep 17 00:00:00 2001
From: Colin Gabrielson <colin@azuqua.com>
Date: Tue, 30 Jan 2018 09:18:07 -0800
Subject: [PATCH] [stable/rabbitmq] Fix breaking bitnami based RabbitMQ vhost
 configuration (#3363)

* revert deletion of RABBITMQ_VHOST environment variable to restore the ability to configure vhosts for bitnami/rabbitmq images

* bump rabbitmq chart version

* removes unused RABBITMQ_DEFAULT_VHOST env variable

* bump version to 0.6.17
---
 stable/rabbitmq/Chart.yaml                | 2 +-
 stable/rabbitmq/templates/deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stable/rabbitmq/Chart.yaml b/stable/rabbitmq/Chart.yaml
index 17476b9e8b..1e9f230d93 100644
--- a/stable/rabbitmq/Chart.yaml
+++ b/stable/rabbitmq/Chart.yaml
@@ -1,5 +1,5 @@
 name: rabbitmq
-version: 0.6.16
+version: 0.6.17
 appVersion: 3.7.2
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
diff --git a/stable/rabbitmq/templates/deployment.yaml b/stable/rabbitmq/templates/deployment.yaml
index a7a0433861..5ac2c0d741 100644
--- a/stable/rabbitmq/templates/deployment.yaml
+++ b/stable/rabbitmq/templates/deployment.yaml
@@ -50,7 +50,7 @@ spec:
           value: {{ printf "%s@%s" (default "rabbit" .Values.rabbitmqNodeName) "localhost" | quote }}
         - name: RABBITMQ_CLUSTER_NODE_NAME
           value: {{ default "" .Values.rabbitmqClusterNodeName | quote }}
-        - name: RABBITMQ_DEFAULT_VHOST
+        - name: RABBITMQ_VHOST
           value: {{ default "/" .Values.rabbitmqVhost | quote }}
         - name: RABBITMQ_MANAGER_PORT_NUMBER
           value: {{ default "15672" .Values.rabbitmqManagerPort | quote }}