openstack/openstack-helm
Code Issues Proposed changes

Merge pull request #210 from alanmeadows/toolkit_maas_fix

Browse Source 
Fix maas template references after common->helm-toolkit rename
This commit is contained in:
Brandon B. Jozsa 2017-02-16 12:00:13 -05:00 committed by GitHub
commit 2b67177532
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maas/templates/configmap-bin.yaml
View File

@ -6,10 +6,10 @@ data:
start.sh: | start.sh: |
{{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} {{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}
maas-region-controller.postinst: | maas-region-controller.postinst: |
{{ tuple "bin/_maas-region-controller.postinst.tpl" . | include "helm_toolkit.template" | indent 4 }} {{ tuple "bin/_maas-region-controller.postinst.tpl" . | include "helm-toolkit.template" | indent 4 }}
import-boot-resources.sh: | import-boot-resources.sh: |
{{ tuple "bin/_import-boot-resources.sh.tpl" . | include "helm_toolkit.template" | indent 4 }} {{ tuple "bin/_import-boot-resources.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}
job-readiness.sh: | job-readiness.sh: |
{{ tuple "bin/_job-readiness.sh.tpl" . | include "helm_toolkit.template" | indent 4 }} {{ tuple "bin/_job-readiness.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}
register-rack-controller.sh: | register-rack-controller.sh: |
{{ tuple "bin/_register-rack-controller.sh.tpl" . | include "helm_toolkit.template" | indent 4 }} {{ tuple "bin/_register-rack-controller.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}

4
maas/templates/configmap-etc.yaml
View File

@ -6,6 +6,6 @@ data:
named.conf.options: |+ named.conf.options: |+
{{ tuple "etc/_region-dns-config.tpl" . | include "helm-toolkit.template" | indent 4 }} {{ tuple "etc/_region-dns-config.tpl" . | include "helm-toolkit.template" | indent 4 }}
secret: | secret: |
{{ tuple "etc/_secret.tpl" . | include "helm_toolkit.template" | indent 4 }} {{ tuple "etc/_secret.tpl" . | include "helm-toolkit.template" | indent 4 }}
maas-region-controller.conf: | maas-region-controller.conf: |
{{ tuple "etc/_postgresql-config.tpl" . | include "helm_toolkit.template" | indent 4 }} {{ tuple "etc/_postgresql-config.tpl" . | include "helm-toolkit.template" | indent 4 }}

2
maas/templates/job-import.yaml
View File

@ -9,7 +9,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependencies | include "dep_check_init_cont" | indent 10 }} {{ tuple $envAll $dependencies | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure