From 93de8767c92c9664dce2670b219c17089907cd51 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Fri, 18 May 2018 13:33:01 -0500
Subject: [PATCH] Nova: Use helm-toolkit template for placement endpoints
 management

This PS uses helm-toolkit for the placement endpoints management job.

Change-Id: I98dea65f0f568cbd0f3b344adfc7e4ac73799200
Signed-off-by: Pete Birley <pete@port.direct>
---
 .../templates/job-ks-placement-endpoints.yaml | 55 +------------------
 1 file changed, 2 insertions(+), 53 deletions(-)

diff --git a/nova/templates/job-ks-placement-endpoints.yaml b/nova/templates/job-ks-placement-endpoints.yaml
index 1ba06f51c3..1a6dbd34be 100644
--- a/nova/templates/job-ks-placement-endpoints.yaml
+++ b/nova/templates/job-ks-placement-endpoints.yaml
@@ -15,57 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_ks_placement_endpoints }}
-{{- $envAll := . }}
-
-{{- $serviceAccountName := "placement-ks-endpoints" }}
-{{ tuple $envAll "ks_endpoints" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: placement-ks-endpoints
-spec:
-  template:
-    metadata:
-      labels:
-{{ tuple $envAll "placement" "ks-endpoints" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
-    spec:
-      serviceAccountName: {{ $serviceAccountName }}
-      restartPolicy: OnFailure
-      nodeSelector:
-        {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
-      initContainers:
-{{ tuple $envAll "ks_endpoints" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
-      containers:
-{{- range $key1, $osServiceType := tuple "placement" }}
-{{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
-        - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
-{{ tuple $envAll "ks_endpoints" | include "helm-toolkit.snippets.image" | indent 10 }}
-{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-          command:
-            - /tmp/ks-endpoints.sh
-          volumeMounts:
-            - name: ks-endpoints-sh
-              mountPath: /tmp/ks-endpoints.sh
-              subPath: ks-endpoints.sh
-              readOnly: true
-          env:
-{{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.admin }}
-{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }}
-{{- end }}
-            - name: OS_SVC_ENDPOINT
-              value: {{ $osServiceEndPoint }}
-            - name: OS_SERVICE_NAME
-              value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }}
-            - name: OS_SERVICE_TYPE
-              value: {{ $osServiceType }}
-            - name: OS_SERVICE_ENDPOINT
-              value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
-{{- end }}
-{{- end }}
-      volumes:
-        - name: ks-endpoints-sh
-          configMap:
-            name: nova-bin
-            defaultMode: 0555
+{{- $ksServiceJob := dict "envAll" . "serviceName" "placement" "configMapBin" "nova-bin" "serviceTypes" ( tuple "placement" ) -}}
+{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }}
 {{- end }}