diff options
| author | Zuul <zuul@review.opendev.org> | 2023-09-19 10:59:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-09-19 10:59:29 +0000 |
| commit | cc9b83acdc7da4501da765e38eaad53b7fa17c6f (patch) | |
| tree | 1ec5bac29161477f9052d6b60109229804250c62 | |
| parent | 8484230ff72680a3967ee4039078d4b826d3c019 (diff) | |
| parent | 3e2afe2f6ecebaa6bd45fcedc25663c7c3780872 (diff) | |
| download | kolla-cc9b83acdc7da4501da765e38eaad53b7fa17c6f.tar.gz kolla-cc9b83acdc7da4501da765e38eaad53b7fa17c6f.zip | |
Merge "Add support for running Nova upgrade checks" into stable/zed
| -rw-r--r-- | docker/nova/nova-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-api/extend_start.sh | 5 |
2 files changed, 6 insertions, 1 deletions
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 |