From 0d473b422e5f5e190a9b5de9e7cafcd0e58ce058 Mon Sep 17 00:00:00 2001
From: Alan Meadows <alan.meadows@gmail.com>
Date: Thu, 16 Feb 2017 07:15:12 -0800
Subject: [PATCH] Fix maas template references after common->helm-toolkit
 rename

---
 maas/templates/configmap-bin.yaml | 8 ++++----
 maas/templates/configmap-etc.yaml | 4 ++--
 maas/templates/job-import.yaml    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/maas/templates/configmap-bin.yaml b/maas/templates/configmap-bin.yaml
index f2a9462626..a7bd3ff0f9 100644
--- a/maas/templates/configmap-bin.yaml
+++ b/maas/templates/configmap-bin.yaml
@@ -6,10 +6,10 @@ data:
   start.sh: |
 {{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}
   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: |
-{{ 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: |
-{{ 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: |
-{{ 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 }}
diff --git a/maas/templates/configmap-etc.yaml b/maas/templates/configmap-etc.yaml
index 37e99010b8..c93166b3e4 100644
--- a/maas/templates/configmap-etc.yaml
+++ b/maas/templates/configmap-etc.yaml
@@ -6,6 +6,6 @@ data:
   named.conf.options: |+
 {{ tuple "etc/_region-dns-config.tpl" . | include "helm-toolkit.template" | indent 4 }}
   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: |
-{{ tuple "etc/_postgresql-config.tpl" . | include "helm_toolkit.template" | indent 4 }}
+{{ tuple "etc/_postgresql-config.tpl" . | include "helm-toolkit.template" | indent 4 }}
diff --git a/maas/templates/job-import.yaml b/maas/templates/job-import.yaml
index 419ab3c023..4b3a6a46e2 100644
--- a/maas/templates/job-import.yaml
+++ b/maas/templates/job-import.yaml
@@ -9,7 +9,7 @@ spec:
     metadata:
       annotations:
         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:
       restartPolicy: OnFailure