From 7c10118a178ac82567324a8184abc95c04d26929 Mon Sep 17 00:00:00 2001
From: "Cobb, Randy" <randy.cobb@nordstrom.com>
Date: Wed, 11 Apr 2018 09:29:00 -0700
Subject: [PATCH] Latest pull request changes made:   - refactored the config
 mechanism to use a template   - added all supported backend storage engines  
 - added a scale option to spin up an entire cluster at once   - various other
 typo fixes

---
 templates/vault/0/docker-compose.yml.tpl | 8 ++++++--
 templates/vault/0/rancher-compose.yml    | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/templates/vault/0/docker-compose.yml.tpl b/templates/vault/0/docker-compose.yml.tpl
index 1febc56..d016622 100755
--- a/templates/vault/0/docker-compose.yml.tpl
+++ b/templates/vault/0/docker-compose.yml.tpl
@@ -21,7 +21,7 @@ services:
     image: vault:0.9.6
     cap_add:
     - IPC_LOCK
-{{- if .Values.VAULT_BACKEND }}
+{{- if .Values.BACKEND_SERVICE }}
     external_links:
     - ${BACKEND_SERVICE}:SERVICE
 {{- end }}
@@ -29,7 +29,11 @@ services:
       VAULT_REDIRECT_INTERFACE: "eth0"
       VAULT_CLUSTER_INTERFACE: "eth0"
       VAULT_LOCAL_CONFIG: |
-        { "storage":{"{{.Values.VAULT_BACKEND}}":{ {{.Values.BACKEND_CONFIGURATION}} }},"listener":{"tcp":{"address":"0.0.0.0:8200","tls_disable":1}},"cluster_name":"{{.Values.VAULT_CLUSTER_NAME}}"}
+        {
+          "storage":{"${VAULT_BACKEND}":{ ${BACKEND_CONFIGURATION} }},
+          "listener":{"tcp":{"address":"0.0.0.0:8200","tls_disable":1}},
+          "cluster_name":"${VAULT_CLUSTER_NAME}"
+        }
     volumes:
     - vault-file:/vault/file
     - vault-config:/vault/config
diff --git a/templates/vault/0/rancher-compose.yml b/templates/vault/0/rancher-compose.yml
index 4fca705..6608ba5 100755
--- a/templates/vault/0/rancher-compose.yml
+++ b/templates/vault/0/rancher-compose.yml
@@ -56,7 +56,6 @@ catalog:
       label: Specify the Backend service to connect to
       description: |
         The pre-installed Backend server to back to.  To reference, you can use the memory variable "SERVICE" in your URLs.  For example: "consul://SERVICE:8500"
-      default: "select"
       type: service
     - variable: BACKEND_CONFIGURATION
       label: Specify the backend configuration in valid JSON format