openstack/openstack-helm
Code Issues Proposed changes

Rebase to pull in changes in common

Browse Source
This commit is contained in:
Larry Rensing 2017-01-30 23:40:35 +00:00
parent 109d447453
commit 674ea30c86
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/templates/snippets/_k8s_init_dep_check.tpl
View File

@ -9,7 +9,7 @@
{ {
"name": "POD_NAME", "name": "POD_NAME",
{{- if $deps.pod -}} {{- if $deps.pod -}}
"value": "{{- $deps.pod . 1 -}}" "value": "{{ index $deps.pod 0 }}"
{{- else -}} {{- else -}}
"valueFrom": { "valueFrom": {
"fieldRef": { "fieldRef": {
@ -46,7 +46,7 @@
}, },
{ {
"name": "DEPENDENCY_CONTAINER", "name": "DEPENDENCY_CONTAINER",
"value": "{{ include "joinListWithColon" $deps.container }}" "value": "{{ include "joinListWithComma" $deps.container }}"
}, },
{ {
"name": "COMMAND", "name": "COMMAND",

2
maas/values.yaml
View File

@ -14,7 +14,7 @@ database:
dependencies: dependencies:
import_resources: import_resources:
pod: pod:
- maas-region-0 - maas-region-0
container: container:
- maas-region - maas-region