From 678c50bb729ece42039a8fae4ad4ac3cc9871d87 Mon Sep 17 00:00:00 2001
From: Clint Shryock <clint@ctshryock.com>
Date: Mon, 19 Nov 2018 15:09:59 -0600
Subject: [PATCH] update config - only on HA for now, may need to split things
 out

---
 templates/server-config-configmap.yaml | 4 ++--
 templates/server-ha-statefulset.yaml   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/server-config-configmap.yaml b/templates/server-config-configmap.yaml
index 100880c..4a128db 100644
--- a/templates/server-config-configmap.yaml
+++ b/templates/server-config-configmap.yaml
@@ -1,5 +1,5 @@
 # StatefulSet to run the actual vault server cluster.
-{{- if (or (and (ne (.Values.server.enabled | toString) "-") .Values.server.enabled) (and (eq (.Values.server.enabled | toString) "-") .Values.global.enabled)) }}
+{{- if (or (and (ne (.Values.consulHA.enabled | toString) "-") .Values.consulHA.enabled) (and (eq (.Values.consulHA.enabled | toString) "-") .Values.global.enabled)) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -11,5 +11,5 @@ metadata:
     release: {{ .Release.Name }}
 data:
   statefulconfig-from-values.hcl: |-
-{{ tpl .Values.server.config . | indent 4 }}
+{{ tpl .Values.consulHA.config . | indent 4 }}
 {{- end }}
diff --git a/templates/server-ha-statefulset.yaml b/templates/server-ha-statefulset.yaml
index bae5d8c..1473879 100644
--- a/templates/server-ha-statefulset.yaml
+++ b/templates/server-ha-statefulset.yaml
@@ -79,7 +79,7 @@ spec:
             - |
                 export VAULT_CLUSTER_ADDR=http://${POD_IP}:8201
 
-                sed -E "s/HOST_IP/${HOST_IP}/g" /vault/config/storageconfig-from-values.hcl > storageconfig.hcl
+                sed -E "s/HOST_IP/${HOST_IP}/g" /vault/config/statefulconfig-from-values.hcl > storageconfig.hcl
                 sed -Ei "s/POD_IP/${POD_IP}/g" storageconfig.hcl
 
                 vault server -config=storageconfig.hcl