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
This commit is contained in:
parent
3d17c6eb49
commit
b2cc1c237c
|
@ -66,7 +66,7 @@ ExecStartPre=mkdir -p /opt/stack/os-config-refresh
|
||||||
ExecStartPre=mkdir -p /srv/magnum
|
ExecStartPre=mkdir -p /srv/magnum
|
||||||
ExecStartPre=-/bin/podman kill heat-container-agent
|
ExecStartPre=-/bin/podman kill heat-container-agent
|
||||||
ExecStartPre=-/bin/podman rm 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 \\
|
ExecStart=/bin/podman run \\
|
||||||
--name heat-container-agent \\
|
--name heat-container-agent \\
|
||||||
--net=host \\
|
--net=host \\
|
||||||
|
|
|
@ -55,11 +55,11 @@ if [ "${new_kube_tag}" != "${KUBE_TAG}" ]; then
|
||||||
done
|
done
|
||||||
|
|
||||||
for service in ${SERVICE_LIST}; do
|
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
|
done
|
||||||
|
|
||||||
for service in ${SERVICE_LIST}; do
|
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
|
done
|
||||||
|
|
||||||
for service in ${SERVICE_LIST}; do
|
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}
|
${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
|
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
|
done
|
||||||
|
|
||||||
${ssh_cmd} atomic images prune
|
${ssh_cmd} atomic images prune
|
||||||
|
|
|
@ -54,7 +54,7 @@ spec:
|
||||||
serviceAccountName: tiller
|
serviceAccountName: tiller
|
||||||
containers:
|
containers:
|
||||||
- name: config-helm
|
- name: config-helm
|
||||||
image: docker.io/openstackmagnum/helm-client:dev
|
image: ${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}helm-client:dev
|
||||||
command:
|
command:
|
||||||
- bash
|
- bash
|
||||||
args:
|
args:
|
||||||
|
|
Loading…
Reference in New Issue