From 563c30c9470e732877ca7302bfd7934381f3b7d9 Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Thu, 15 Feb 2018 10:32:50 -0500
Subject: [PATCH] Nova: Make image keys service specific

This PS makes the image keys service specific, inline with other
OpenStack-Helm charts.

Change-Id: I1259afa632b6a3eab4acb3fee0fc6c06b1e68694
---
 nova/templates/daemonset-compute.yaml         | 12 ++---
 nova/templates/deployment-api-metadata.yaml   |  4 +-
 nova/templates/deployment-api-osapi.yaml      |  2 +-
 nova/templates/deployment-conductor.yaml      |  2 +-
 nova/templates/deployment-consoleauth.yaml    |  2 +-
 nova/templates/deployment-novncproxy.yaml     |  6 +--
 nova/templates/deployment-placement.yaml      |  2 +-
 nova/templates/deployment-scheduler.yaml      |  2 +-
 nova/templates/deployment-spiceproxy.yaml     |  6 +--
 nova/templates/job-cell-setup.yaml            |  2 +-
 .../templates/statefulset-compute-ironic.yaml |  2 +-
 nova/values.yaml                              | 46 +++++++++----------
 12 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml
index b3ead11873..501428b24c 100644
--- a/nova/templates/daemonset-compute.yaml
+++ b/nova/templates/daemonset-compute.yaml
@@ -48,7 +48,7 @@ spec:
       initContainers:
 {{ tuple $envAll $dependencies $mounts_nova_compute_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: nova-compute-init
-          image: {{ .Values.images.tags.compute }}
+          image: {{ .Values.images.tags.nova_compute }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
@@ -66,7 +66,7 @@ spec:
               mountPath: /var/lib/nova
         {{- if .Values.ceph.enabled }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.compute }}
+          image: {{ .Values.images.tags.nova_compute }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: {{ .Values.pod.user.nova.uid }}
@@ -94,7 +94,7 @@ spec:
         {{ end }}
         {{- if eq .Values.console.console_kind "novnc"}}
         - name: nova-compute-vnc-init
-          image: {{ .Values.images.tags.compute }}
+          image: {{ .Values.images.tags.nova_compute }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
@@ -111,7 +111,7 @@ spec:
         {{ end }}
         {{- if eq .Values.console.console_kind "spice"}}
         - name: nova-compute-spice-init
-          image: {{ .Values.images.tags.compute }}
+          image: {{ .Values.images.tags.nova_compute }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
@@ -128,7 +128,7 @@ spec:
         {{ end }}
       containers:
         - name: nova-compute
-          image: {{ .Values.images.tags.compute }}
+          image: {{ .Values.images.tags.nova_compute }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
@@ -221,7 +221,7 @@ spec:
               readOnly: true
 {{ if $mounts_nova_compute.volumeMounts }}{{ toYaml $mounts_nova_compute.volumeMounts | indent 12 }}{{ end }}
         - name: nova-compute-ssh
-          image: {{ .Values.images.tags.compute_ssh }}
+          image: {{ .Values.images.tags.nova_compute_ssh }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.ssh | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml
index ad1a792cd0..e3e85add7d 100644
--- a/nova/templates/deployment-api-metadata.yaml
+++ b/nova/templates/deployment-api-metadata.yaml
@@ -48,7 +48,7 @@ spec:
       initContainers:
 {{ tuple $envAll $dependencies $mounts_nova_api_metadata_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: nova-api-metadata-init
-          image: {{ .Values.images.tags.api }}
+          image: {{ .Values.images.tags.nova_api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
@@ -68,7 +68,7 @@ spec:
               mountPath: /tmp/pod-shared
       containers:
         - name: nova-api
-          image: {{ .Values.images.tags.api }}
+          image: {{ .Values.images.tags.nova_api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml
index e667a60ea2..29fe83491d 100644
--- a/nova/templates/deployment-api-osapi.yaml
+++ b/nova/templates/deployment-api-osapi.yaml
@@ -49,7 +49,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_nova_api_osapi_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: nova-osapi
-          image: {{ .Values.images.tags.api }}
+          image: {{ .Values.images.tags.nova_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/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml
index d1dec94d5a..3cc89b1b76 100644
--- a/nova/templates/deployment-conductor.yaml
+++ b/nova/templates/deployment-conductor.yaml
@@ -48,7 +48,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_nova_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: nova-conductor
-          image: {{ .Values.images.tags.conductor }}
+          image: {{ .Values.images.tags.nova_conductor }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml
index ed85d44452..331d54ffd6 100644
--- a/nova/templates/deployment-consoleauth.yaml
+++ b/nova/templates/deployment-consoleauth.yaml
@@ -48,7 +48,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_nova_consoleauth_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: nova-consoleauth
-          image: {{ .Values.images.tags.consoleauth }}
+          image: {{ .Values.images.tags.nova_consoleauth }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.consoleauth | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml
index 1f7c9d5486..aa4162ea93 100644
--- a/nova/templates/deployment-novncproxy.yaml
+++ b/nova/templates/deployment-novncproxy.yaml
@@ -50,7 +50,7 @@ spec:
       initContainers:
 {{ tuple $envAll $dependencies $mounts_nova_novncproxy_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: nova-novncproxy-init
-          image: {{ .Values.images.tags.novncproxy }}
+          image: {{ .Values.images.tags.nova_novncproxy }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
@@ -69,7 +69,7 @@ spec:
             - name: pod-shared
               mountPath: /tmp/pod-shared
         - name: nova-novncproxy-init-assets
-          image: {{ .Values.images.tags.novncproxy_assets }}
+          image: {{ .Values.images.tags.nova_novncproxy_assets }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
@@ -83,7 +83,7 @@ spec:
               mountPath: /tmp/usr/share/novnc
       containers:
         - name: nova-novncproxy
-          image: {{ .Values.images.tags.novncproxy }}
+          image: {{ .Values.images.tags.nova_novncproxy }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
diff --git a/nova/templates/deployment-placement.yaml b/nova/templates/deployment-placement.yaml
index 0ad4c4e6f1..8b73d7ef5d 100644
--- a/nova/templates/deployment-placement.yaml
+++ b/nova/templates/deployment-placement.yaml
@@ -49,7 +49,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_nova_placement_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: nova-placement-api
-          image: {{ .Values.images.tags.placement }}
+          image: {{ .Values.images.tags.nova_placement }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.placement | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml
index ce36befba1..a383f77f37 100644
--- a/nova/templates/deployment-scheduler.yaml
+++ b/nova/templates/deployment-scheduler.yaml
@@ -48,7 +48,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_nova_scheduler_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: nova-scheduler
-          image: {{ .Values.images.tags.scheduler }}
+          image: {{ .Values.images.tags.nova_scheduler }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/nova/templates/deployment-spiceproxy.yaml b/nova/templates/deployment-spiceproxy.yaml
index 17c8bc32e3..fd1d68f5a7 100644
--- a/nova/templates/deployment-spiceproxy.yaml
+++ b/nova/templates/deployment-spiceproxy.yaml
@@ -50,7 +50,7 @@ spec:
       initContainers:
 {{ tuple $envAll $dependencies $mounts_nova_spiceproxy_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: nova-spiceproxy-init
-          image: {{ .Values.images.tags.spiceproxy }}
+          image: {{ .Values.images.tags.nova_spiceproxy }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.spiceproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
@@ -69,7 +69,7 @@ spec:
             - name: pod-shared
               mountPath: /tmp/pod-shared
         - name: nova-spiceproxy-init-assets
-          image: {{ .Values.images.tags.spiceproxy_assets }}
+          image: {{ .Values.images.tags.nova_spiceproxy_assets }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.spiceproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
@@ -83,7 +83,7 @@ spec:
               mountPath: /tmp/usr/share/spice-html5
       containers:
         - name: nova-spiceproxy
-          image: {{ .Values.images.tags.spiceproxy }}
+          image: {{ .Values.images.tags.nova_spiceproxy }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.spiceproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
diff --git a/nova/templates/job-cell-setup.yaml b/nova/templates/job-cell-setup.yaml
index 78233ae749..a1a85063cc 100644
--- a/nova/templates/job-cell-setup.yaml
+++ b/nova/templates/job-cell-setup.yaml
@@ -39,7 +39,7 @@ spec:
 {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: nova-cell-setup
-          image: {{ .Values.images.tags.cell_setup }}
+          image: {{ .Values.images.tags.nova_cell_setup }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.cell_setup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
diff --git a/nova/templates/statefulset-compute-ironic.yaml b/nova/templates/statefulset-compute-ironic.yaml
index d6357702a8..8fe5c7afea 100644
--- a/nova/templates/statefulset-compute-ironic.yaml
+++ b/nova/templates/statefulset-compute-ironic.yaml
@@ -52,7 +52,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_nova_compute_ironic_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: nova-compute-ironic
-          image: {{ .Values.images.tags.compute_ironic }}
+          image: {{ .Values.images.tags.nova_compute_ironic }}
           imagePullPolicy: {{ .Values.images.tags.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.compute_ironic | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
diff --git a/nova/values.yaml b/nova/values.yaml
index fee2f24956..8c04b3fc93 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -56,30 +56,30 @@ labels:
     node_selector_value: enabled
 
 images:
+  pull_policy: IfNotPresent
   tags:
-    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-nova-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-nova-api:3.0.3
-    conductor: docker.io/kolla/ubuntu-source-nova-conductor:3.0.3
-    scheduler: docker.io/kolla/ubuntu-source-nova-scheduler:3.0.3
-    novncproxy: docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3
-    novncproxy_assets: docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3
-    spiceproxy: docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3
-    spiceproxy_assets: docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3
-    consoleauth: docker.io/kolla/ubuntu-source-nova-consoleauth:3.0.3
-    compute: docker.io/kolla/ubuntu-source-nova-compute:3.0.3
-    compute_ssh: docker.io/kolla/ubuntu-source-nova-ssh:3.0.3
-    compute_ironic: docker.io/kolla/ubuntu-source-nova-compute-ironic:3.0.3
-    placement: docker.io/kolla/ubuntu-source-nova-placement-api:3.0.3-beta.1
-    bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-    cell_setup: docker.io/kolla/ubuntu-source-nova-api:3.0.3
-  pull_policy: "IfNotPresent"
+    bootstrap: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3'
+    db_drop: '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-nova-api:3.0.3'
+    dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.2.1'
+    ks_endpoints: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3'
+    ks_service: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3'
+    ks_user: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3'
+    nova_api: 'docker.io/kolla/ubuntu-source-nova-api:3.0.3'
+    nova_cell_setup: 'docker.io/kolla/ubuntu-source-nova-api:3.0.3'
+    nova_compute: 'docker.io/kolla/ubuntu-source-nova-compute:3.0.3'
+    nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:3.0.3'
+    nova_compute_ssh: 'docker.io/kolla/ubuntu-source-nova-ssh:3.0.3'
+    nova_conductor: 'docker.io/kolla/ubuntu-source-nova-conductor:3.0.3'
+    nova_consoleauth: 'docker.io/kolla/ubuntu-source-nova-consoleauth:3.0.3'
+    nova_novncproxy: 'docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3'
+    nova_novncproxy_assets: 'docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3'
+    nova_placement: 'docker.io/kolla/ubuntu-source-nova-placement-api:3.0.3-beta.1'
+    nova_scheduler: 'docker.io/kolla/ubuntu-source-nova-scheduler:3.0.3'
+    nova_spiceproxy: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3'
+    nova_spiceproxy_assets: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3'
+    test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'
 
 bootstrap:
   enabled: true