diff options
| author | Zuul <zuul@review.opendev.org> | 2021-05-05 11:50:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-05-05 11:50:41 +0000 |
| commit | dccb1a50e8545900711e2d579c87958ac447569c (patch) | |
| tree | f066d444144d5d3c5618c632becae313b4b326c9 /docker | |
| parent | 7e9921814b0754a01002ed65049859b0f87a3bf2 (diff) | |
| parent | e01a490c97286a7aac66244aee7b79836d371422 (diff) | |
| download | kolla-dccb1a50e8545900711e2d579c87958ac447569c.tar.gz kolla-dccb1a50e8545900711e2d579c87958ac447569c.zip | |
Merge "Deprecate tempest and rally"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/rally/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/rally/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/tempest/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/tempest/extend_start.sh | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 index ef76824c4..a3ab3730f 100644 --- a/docker/rally/Dockerfile.j2 +++ b/docker/rally/Dockerfile.j2 @@ -3,6 +3,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} +# rally image is deprecated + {% block rally_header %}{% endblock %} {% import "macros.j2" as macros with context %} diff --git a/docker/rally/extend_start.sh b/docker/rally/extend_start.sh index 88f3d054f..14d98c6dd 100644 --- a/docker/rally/extend_start.sh +++ b/docker/rally/extend_start.sh @@ -1,5 +1,7 @@ #!/bin/bash +echo "rally image is deprecated" + if [[ ! -d "/var/log/kolla/rally" ]]; then mkdir -p /var/log/kolla/rally fi diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index de3a49358..93a73e2f5 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -3,6 +3,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} +# tempest image is deprecated + {% block tempest_header %}{% endblock %} {% import "macros.j2" as macros with context %} diff --git a/docker/tempest/extend_start.sh b/docker/tempest/extend_start.sh index 48397041f..974376afc 100644 --- a/docker/tempest/extend_start.sh +++ b/docker/tempest/extend_start.sh @@ -1,5 +1,7 @@ #! /bin/bash +echo "tempest image is deprecated" + if [[ ! -d "/var/log/kolla/tempest" ]]; then mkdir -p /var/log/kolla/tempest fi |