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
This commit is contained in:
Cobb, Randy 2018-04-11 09:29:00 -07:00
parent 27a4f2b934
commit 7c10118a17
2 changed files with 6 additions and 3 deletions

View File

@ -21,7 +21,7 @@ services:
image: vault:0.9.6 image: vault:0.9.6
cap_add: cap_add:
- IPC_LOCK - IPC_LOCK
{{- if .Values.VAULT_BACKEND }} {{- if .Values.BACKEND_SERVICE }}
external_links: external_links:
- ${BACKEND_SERVICE}:SERVICE - ${BACKEND_SERVICE}:SERVICE
{{- end }} {{- end }}
@ -29,7 +29,11 @@ services:
VAULT_REDIRECT_INTERFACE: "eth0" VAULT_REDIRECT_INTERFACE: "eth0"
VAULT_CLUSTER_INTERFACE: "eth0" VAULT_CLUSTER_INTERFACE: "eth0"
VAULT_LOCAL_CONFIG: | 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: volumes:
- vault-file:/vault/file - vault-file:/vault/file
- vault-config:/vault/config - vault-config:/vault/config

View File

@ -56,7 +56,6 @@ catalog:
label: Specify the Backend service to connect to label: Specify the Backend service to connect to
description: | 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" 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 type: service
- variable: BACKEND_CONFIGURATION - variable: BACKEND_CONFIGURATION
label: Specify the backend configuration in valid JSON format label: Specify the backend configuration in valid JSON format