From 3e2afe2f6ecebaa6bd45fcedc25663c7c3780872 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 28 Mar 2023 09:03:20 +0200 Subject: Add support for running Nova upgrade checks NOTE: Specific to the Zed release, the KOLLA_UPGRADE_CHECK feature is not guaranteed to be present in the nova_api image. As such. a label has been added to be checked for in Kolla-Ansible. Related-Bug: #1957080 Change-Id: I6cbbdfcd40a8f486a3a636b41d704ee6ffafb812 (cherry picked from commit 48b5980c6352ad4e5cf0ac6da369140910c8f389) --- docker/nova/nova-api/Dockerfile.j2 | 2 +- docker/nova/nova-api/extend_start.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'docker/nova') diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 395555564..9cd86b1a9 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" upgrade_check=true {% endblock %} {% block nova_api_header %}{% endblock %} diff --git a/docker/nova/nova-api/extend_start.sh b/docker/nova/nova-api/extend_start.sh index aec89f621..65d759d2f 100644 --- a/docker/nova/nova-api/extend_start.sh +++ b/docker/nova/nova-api/extend_start.sh @@ -24,4 +24,9 @@ if [[ "${!KOLLA_OSM[@]}" ]]; then exit 0 fi +if [[ "${!KOLLA_UPGRADE_CHECK[@]}" ]]; then + nova-status upgrade check + exit $? +fi + . /usr/local/bin/kolla_httpd_setup -- cgit v1.2.3