diff options
| author | Chandan Kumar <chkumar@redhat.com> | 2019-04-17 11:56:03 +0530 |
|---|---|---|
| committer | Chandan Kumar <chkumar@redhat.com> | 2019-04-17 11:56:03 +0530 |
| commit | 8b8958459809940b812364542a6994a89624f981 (patch) | |
| tree | 9e3fbf5f3918cbec4a2a6b876de631b863e30322 /docker | |
| parent | 89b1ee6ebac5f5b40cbf09e5e7b0b69ae0d24110 (diff) | |
| download | kolla-8b8958459809940b812364542a6994a89624f981.tar.gz kolla-8b8958459809940b812364542a6994a89624f981.zip | |
Reuse /var/lib/tempest symlink for rpm also
https://review.openstack.org/#/c/605980/ with this review in
tripleo, we use /var/lib/tempest path but in kolla tempest
dockerfile /usr/share/openstack-tempest is used which is not
mounted in tripleo deployment.
Let's reuse the same volume with tempest container instead
of /usr/share/openstack-tempest.
Change-Id: I402f58ce53fdce426582cf2fc31349da6d2f5ae0
Signed-off-by: Chandan Kumar <chkumar@redhat.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/tempest/Dockerfile.j2 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index c2c16e15a..ec0edf161 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -11,17 +11,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set tempest_packages = ['openstack-tempest-all'] %} -{{ macros.install_packages(tempest_packages | customizable("packages")) }} -RUN ln -sf /usr/share/openstack-tempest /tempest - {% elif base_package_type == 'deb' %} {% set tempest_packages = ['tempest'] %} + {% endif %} + {{ macros.install_packages(tempest_packages | customizable("packages")) }} RUN ln -sf /var/lib/tempest /tempest - {% endif %} - {% elif install_type == 'source' %} ADD tempest-archive /tempest-source |