From b2cc1c237c0aa221d87bc72fcb500e3d16d17128 Mon Sep 17 00:00:00 2001
From: Bharat Kunwar <brtknr@bath.edu>
Date: Wed, 20 Nov 2019 13:34:52 +0000
Subject: [PATCH] bug: Use configured heat-container-agent tag

Remove hard coded reference to train-dev which ends up pulling multiple
images down and use HEAT_CONTAINER_AGENT_TAG instead.

Also add missing CONTAINER_INFRA_PREFIX.

Story: 2006459
Task: 37566

Change-Id: Ic8d0e3ba125ef6ce7fde68c086ccbdb4730ac4a6
---
 .../templates/kubernetes/fragments/start-container-agent.sh | 2 +-
 .../templates/kubernetes/fragments/upgrade-kubernetes.sh    | 6 +++---
 .../common/templates/kubernetes/helm/metrics-server.sh      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh b/magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh
index 465abc4ab6..2886105b4f 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh
@@ -66,7 +66,7 @@ ExecStartPre=mkdir -p /opt/stack/os-config-refresh
 ExecStartPre=mkdir -p /srv/magnum
 ExecStartPre=-/bin/podman kill heat-container-agent
 ExecStartPre=-/bin/podman rm heat-container-agent
-ExecStartPre=-/bin/podman pull docker.io/openstackmagnum/heat-container-agent:train-dev
+ExecStartPre=-/bin/podman pull ${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}heat-container-agent:${HEAT_CONTAINER_AGENT_TAG}
 ExecStart=/bin/podman run \\
     --name heat-container-agent \\
     --net=host \\
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/upgrade-kubernetes.sh b/magnum/drivers/common/templates/kubernetes/fragments/upgrade-kubernetes.sh
index 267b8f4c89..7b2755fb0d 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/upgrade-kubernetes.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/upgrade-kubernetes.sh
@@ -55,11 +55,11 @@ if [ "${new_kube_tag}" != "${KUBE_TAG}" ]; then
         done
 
         for service in ${SERVICE_LIST}; do
-            ${ssh_cmd} atomic pull --storage ostree "docker.io/openstackmagnum/${service_image_mapping[${service}]}:${new_kube_tag}"
+            ${ssh_cmd} atomic pull --storage ostree "${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}${service_image_mapping[${service}]}:${new_kube_tag}"
         done
 
         for service in ${SERVICE_LIST}; do
-            ${ssh_cmd} atomic containers update --rebase docker.io/openstackmagnum/${service_image_mapping[${service}]}:${new_kube_tag} ${service}
+            ${ssh_cmd} atomic containers update --rebase ${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}${service_image_mapping[${service}]}:${new_kube_tag} ${service}
         done
 
         for service in ${SERVICE_LIST}; do
@@ -69,7 +69,7 @@ if [ "${new_kube_tag}" != "${KUBE_TAG}" ]; then
         ${ssh_cmd} /var/lib/containers/atomic/heat-container-agent.0/rootfs/usr/bin/kubectl --kubeconfig /etc/kubernetes/kubelet-config.yaml uncordon ${INSTANCE_NAME}
 
         for service in ${SERVICE_LIST}; do
-            ${ssh_cmd} atomic --assumeyes images "delete docker.io/openstackmagnum/${service_image_mapping[${service}]}:${KUBE_TAG}"
+            ${ssh_cmd} atomic --assumeyes images "delete ${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}${service_image_mapping[${service}]}:${KUBE_TAG}"
         done
 
         ${ssh_cmd} atomic images prune
diff --git a/magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh b/magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh
index bcd5b368a0..b53f820876 100755
--- a/magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh
+++ b/magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh
@@ -54,7 +54,7 @@ spec:
       serviceAccountName: tiller
       containers:
       - name: config-helm
-        image: docker.io/openstackmagnum/helm-client:dev
+        image: ${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}helm-client:dev
         command:
         - bash
         args: