From 87eb9ab73d53b083c4819b0e974cc3b086fbf247 Mon Sep 17 00:00:00 2001
From: Ryan Dawson <ryan.dawson@alfresco.com>
Date: Wed, 15 Aug 2018 17:48:19 +0100
Subject: [PATCH] match back to published chart as rabbitmq host doesnt seem to
 be feeding through

---
 .../templates/deployment.yaml                       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/charts/example-runtime-bundle/templates/deployment.yaml b/charts/example-runtime-bundle/templates/deployment.yaml
index aa655721..03574fad 100755
--- a/charts/example-runtime-bundle/templates/deployment.yaml
+++ b/charts/example-runtime-bundle/templates/deployment.yaml
@@ -33,9 +33,17 @@ spec:
         - name: SPRING_RABBITMQ_HOST
         {{- if .Values.global.rabbitmq.host.value }}
           value: "{{ .Values.global.rabbitmq.host.value }}"
-        {{- else }}
+        {{ else }}
           value: "{{ .Release.Name }}-rabbitmq"
-        {{- end }}
+        {{ end }}
+        - name: SPRING_RABBITMQ_USERNAME
+          value: {{ .Values.global.rabbitmq.username.value }}
+        - name: SPRING_RABBITMQ_HOST
+{{- if .Values.global.rabbitmq.host.value }}
+          value: "{{ .Values.global.rabbitmq.host.value }}"
+{{- else }}
+          value: "{{ .Release.Name }}-rabbitmq"
+{{- end }}
         - name: SPRING_RABBITMQ_USERNAME
           value: {{ .Values.global.rabbitmq.username.value }}
         - name: SPRING_RABBITMQ_PASSWORD
@@ -44,7 +52,6 @@ spec:
         - name: ACT_KEYCLOAK_URL
           value: "{{ .Values.global.keycloak.url }}"
 {{- end }}
-{{- if .Values.db.deployPostgres }}
         - name: SPRING_DATASOURCE_URL
   {{- if .Values.db.uri }}
           value: "{{ .Values.db.uri }}"