From 8ba057ba641d13e030d32f7e70f9bd61b5474fe7 Mon Sep 17 00:00:00 2001
From: Tin Lam <tin@irrational.io>
Date: Fri, 1 Dec 2017 11:20:08 -0600
Subject: [PATCH] Images: Senlin service specific explicit image names

This patch set makes the service-specific images for senlin
have explicit names, allowing simple over-riding of images
for an entire site.

Change-Id: I16ba85b20c84354d7e2c35b52ccc4f766e9fecb6
---
 senlin/templates/deployment-api.yaml     | 2 +-
 senlin/templates/job-db-sync.yaml        | 2 +-
 senlin/templates/statefulset-engine.yaml | 2 +-
 senlin/values.yaml                       | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml
index 559350fcb1..110413c54e 100644
--- a/senlin/templates/deployment-api.yaml
+++ b/senlin/templates/deployment-api.yaml
@@ -44,7 +44,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_senlin_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: senlin-api
-          image: {{ .Values.images.tags.api }}
+          image: {{ .Values.images.tags.senlin_api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/senlin/templates/job-db-sync.yaml b/senlin/templates/job-db-sync.yaml
index 4971d3d2a2..d9e48e444f 100644
--- a/senlin/templates/job-db-sync.yaml
+++ b/senlin/templates/job-db-sync.yaml
@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: senlin-db-sync
-          image: {{ .Values.images.tags.db_sync }}
+          image: {{ .Values.images.tags.senlin_db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
diff --git a/senlin/templates/statefulset-engine.yaml b/senlin/templates/statefulset-engine.yaml
index a9ce079d76..2a8076bc13 100644
--- a/senlin/templates/statefulset-engine.yaml
+++ b/senlin/templates/statefulset-engine.yaml
@@ -40,7 +40,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_senlin_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: senlin-engine
-          image: {{ .Values.images.tags.engine }}
+          image: {{ .Values.images.tags.senlin_engine }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/senlin/values.yaml b/senlin/values.yaml
index 8f45445d16..1ffc0abe56 100644
--- a/senlin/values.yaml
+++ b/senlin/values.yaml
@@ -27,13 +27,13 @@ images:
   tags:
     bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-    db_sync: docker.io/kolla/ubuntu-source-senlin-api:3.0.3
+    senlin_db_sync: docker.io/kolla/ubuntu-source-senlin-api:3.0.3
     db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-    api: docker.io/kolla/ubuntu-source-senlin-api:3.0.3
-    engine: docker.io/kolla/ubuntu-source-senlin-engine:3.0.3
+    senlin_api: docker.io/kolla/ubuntu-source-senlin-api:3.0.3
+    senlin_engine: docker.io/kolla/ubuntu-source-senlin-engine:3.0.3
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
   pull_policy: "IfNotPresent"