diff options
| author | Zuul <zuul@review.opendev.org> | 2023-12-20 17:01:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-12-20 17:01:44 +0000 |
| commit | f8b9bdba2f788da41de4d12fd3878f39d6b9a6ec (patch) | |
| tree | 5f697f5ab7d6b7f7a019bf06f3b9b7ac1e6754f0 | |
| parent | e03b0ac0c1fa9227f92895871fade9ed94449299 (diff) | |
| parent | 2fc3c9350cc653e118c50c9ee494c55891084b57 (diff) | |
| download | kolla-f8b9bdba2f788da41de4d12fd3878f39d6b9a6ec.tar.gz kolla-f8b9bdba2f788da41de4d12fd3878f39d6b9a6ec.zip | |
Merge "Adding db sync script for venus" into stable/zed
| -rw-r--r-- | docker/venus/venus-api/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/venus/venus-api/extend_start.sh | 8 | ||||
| -rw-r--r-- | docker/venus/venus-manager/Dockerfile.j2 | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/docker/venus/venus-api/Dockerfile.j2 b/docker/venus/venus-api/Dockerfile.j2 index a10e55535..c5f1641ee 100644 --- a/docker/venus/venus-api/Dockerfile.j2 +++ b/docker/venus/venus-api/Dockerfile.j2 @@ -5,6 +5,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block venus_api_header %}{% endblock %} +COPY extend_start.sh /usr/local/bin/kolla_venus_extend_start +RUN chmod 644 /usr/local/bin/kolla_venus_extend_start + {% block venus_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/venus/venus-api/extend_start.sh b/docker/venus/venus-api/extend_start.sh new file mode 100644 index 000000000..bbe03bbbc --- /dev/null +++ b/docker/venus/venus-api/extend_start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases +# of the KOLLA_BOOTSTRAP variable being set, including empty. +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + venus_manager db sync + exit 0 +fi diff --git a/docker/venus/venus-manager/Dockerfile.j2 b/docker/venus/venus-manager/Dockerfile.j2 index 272a905e6..ae7d215df 100644 --- a/docker/venus/venus-manager/Dockerfile.j2 +++ b/docker/venus/venus-manager/Dockerfile.j2 @@ -5,8 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block venus_manager_header %}{% endblock %} -RUN chmod 644 /usr/local/bin/kolla_venus_extend_start - {% block venus_manager_footer %}{% endblock %} {% block footer %}{% endblock %} |