From 1c5b5024cfba32cc361500df8809cb202d9cb487 Mon Sep 17 00:00:00 2001
From: Tin Lam <tin@irrational.io>
Date: Fri, 1 Dec 2017 11:14:30 -0600
Subject: [PATCH] Images: Neutron service specific explicit image names

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

Change-Id: Ica7e1f77f43936971d44ac0e6645ac656ca83b96
---
 neutron/templates/daemonset-dhcp-agent.yaml     |  2 +-
 neutron/templates/daemonset-l3-agent.yaml       |  2 +-
 neutron/templates/daemonset-metadata-agent.yaml |  4 ++--
 neutron/templates/deployment-server.yaml        |  2 +-
 neutron/templates/job-db-sync.yaml              |  2 +-
 neutron/templates/pod-rally-test.yaml           |  2 +-
 neutron/values.yaml                             | 12 ++++++------
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml
index e34d8494ef..a5f3524660 100644
--- a/neutron/templates/daemonset-dhcp-agent.yaml
+++ b/neutron/templates/daemonset-dhcp-agent.yaml
@@ -42,7 +42,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_neutron_dhcp_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: neutron-dhcp-agent
-          image: {{ .Values.images.tags.dhcp }}
+          image: {{ .Values.images.tags.neutron_dhcp }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.dhcp | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml
index 0cd58472e6..528546f6d9 100644
--- a/neutron/templates/daemonset-l3-agent.yaml
+++ b/neutron/templates/daemonset-l3-agent.yaml
@@ -42,7 +42,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_neutron_l3_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: neutron-l3-agent
-          image: {{ .Values.images.tags.l3 }}
+          image: {{ .Values.images.tags.neutron_l3 }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.l3 | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml
index 28cceb6e04..3af7c04053 100644
--- a/neutron/templates/daemonset-metadata-agent.yaml
+++ b/neutron/templates/daemonset-metadata-agent.yaml
@@ -41,7 +41,7 @@ spec:
       initContainers:
 {{ tuple $envAll $dependencies $mounts_neutron_metadata_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: neutron-metadata-agent-init
-          image: {{ .Values.images.tags.metadata }}
+          image: {{ .Values.images.tags.neutron_metadata }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
@@ -61,7 +61,7 @@ spec:
               mountPath: /tmp/pod-shared
       containers:
         - name: neutron-metadata-agent
-          image: {{ .Values.images.tags.metadata }}
+          image: {{ .Values.images.tags.neutron_metadata }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml
index b5677af621..d280bc4a35 100644
--- a/neutron/templates/deployment-server.yaml
+++ b/neutron/templates/deployment-server.yaml
@@ -44,7 +44,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_neutron_server_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: neutron-server
-          image: {{ .Values.images.tags.server }}
+          image: {{ .Values.images.tags.neutron_server }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml
index c0a2345c09..f49f97bb67 100644
--- a/neutron/templates/job-db-sync.yaml
+++ b/neutron/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: neutron-db-sync
-          image: {{ .Values.images.tags.db_sync }}
+          image: {{ .Values.images.tags.neutron_db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           {{- if .Values.pod.resources.enabled }}
diff --git a/neutron/templates/pod-rally-test.yaml b/neutron/templates/pod-rally-test.yaml
index 5114bba678..660c2c44b5 100644
--- a/neutron/templates/pod-rally-test.yaml
+++ b/neutron/templates/pod-rally-test.yaml
@@ -32,7 +32,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_neutron_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
   containers:
     - name: {{.Release.Name}}-token-issue-test
-      image: {{ .Values.images.tags.test }}
+      image: {{ .Values.images.tags.neutron_test }}
       imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
diff --git a/neutron/values.yaml b/neutron/values.yaml
index ee2e2782db..24b517d78f 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -22,17 +22,17 @@ release_group: null
 images:
   tags:
     bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-    test: docker.io/kolla/ubuntu-source-rally:4.0.0
+    neutron_test: docker.io/kolla/ubuntu-source-rally:4.0.0
     db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-    db_sync: docker.io/kolla/ubuntu-source-neutron-server:3.0.3
+    neutron_db_sync: docker.io/kolla/ubuntu-source-neutron-server: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
-    server: docker.io/kolla/ubuntu-source-neutron-server:3.0.3
-    dhcp: docker.io/kolla/ubuntu-source-neutron-dhcp-agent:3.0.3
-    metadata: docker.io/kolla/ubuntu-source-neutron-metadata-agent:3.0.3
-    l3: docker.io/kolla/ubuntu-source-neutron-l3-agent:3.0.3
+    neutron_server: docker.io/kolla/ubuntu-source-neutron-server:3.0.3
+    neutron_dhcp: docker.io/kolla/ubuntu-source-neutron-dhcp-agent:3.0.3
+    neutron_metadata: docker.io/kolla/ubuntu-source-neutron-metadata-agent:3.0.3
+    neutron_l3: docker.io/kolla/ubuntu-source-neutron-l3-agent:3.0.3
     neutron_openvswitch_agent: docker.io/kolla/ubuntu-source-neutron-openvswitch-agent:3.0.3
     neutron_linuxbridge_agent: docker.io/kolla/ubuntu-source-neutron-linuxbridge-agent:3.0.3
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1