diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-26 10:57:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-26 10:57:00 +0000 |
| commit | 201c4aea940491c647bd750e2ebe81de2d3ac49b (patch) | |
| tree | 9291c224227cd151d7fadc6d9b405621f1d50539 /docker | |
| parent | ad00caaf9341bb58fd73969782a3f89b8189fb94 (diff) | |
| parent | f205c8ffac24d41c7d10c299770ecabbc4569711 (diff) | |
| download | kolla-201c4aea940491c647bd750e2ebe81de2d3ac49b.tar.gz kolla-201c4aea940491c647bd750e2ebe81de2d3ac49b.zip | |
Merge "vitrage-base: honor distro_python_version" into stable/train
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/vitrage/vitrage-base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2 index ed217b77c..a45f3cc16 100644 --- a/docker/vitrage/vitrage-base/Dockerfile.j2 +++ b/docker/vitrage/vitrage-base/Dockerfile.j2 @@ -17,7 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} \ && mkdir -p /var/www/cgi-bin/vitrage \ - && cp -a /usr/lib/python2.7/site-packages/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage/ \ + && cp -a /usr/lib/python{{ distro_python_version }}/site-packages/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage/ \ && chown -R vitrage: /var/www/cgi-bin/vitrage {% elif base_package_type == 'deb' %} |