From 4dcd379d1e141cbb57d5b30230ddd66462041ee9 Mon Sep 17 00:00:00 2001
From: Matthew Jones <bsdmatburt@gmail.com>
Date: Mon, 13 Aug 2018 13:27:00 -0400
Subject: [PATCH] Add some env variables to the web deployment

This allows the start script to properly wait on services to come
online rather than getting stuck and waiting for the full timeout
---
 .../roles/kubernetes/templates/deployment.yml.j2  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2
index 4234a62ca3..7387b5e8d1 100644
--- a/installer/roles/kubernetes/templates/deployment.yml.j2
+++ b/installer/roles/kubernetes/templates/deployment.yml.j2
@@ -133,6 +133,21 @@ spec:
         - name: {{ kubernetes_deployment_name }}-web
           image: {{ kubernetes_web_image | default(dockerhub_web_image) }}
           imagePullPolicy: Always
+          env:
+            - name: DATABASE_USER
+              value: {{ pg_username }}
+            - name: DATABASE_NAME
+              value: {{ pg_database }}
+            - name: DATABASE_HOST
+              value: {{ pg_hostname|default('postgresql') }}
+            - name: DATABASE_PORT
+              value: "{{ pg_port|default('5432') }}"
+            - name: DATABASE_PASSWORD
+              value: {{ pg_password }}
+            - name: MEMCACHED_HOST
+              value: {{ memcached_hostname|default('localhost') }}
+            - name: RABBITMQ_HOST
+              value: {{ rabbitmq_hostname|default('localhost') }}
           ports:
             - containerPort: 8052
           volumeMounts: