diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-15 14:02:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-15 14:02:57 +0000 |
| commit | 2f66efdf5e2cef7cf5ca8b44759003c14a103ecf (patch) | |
| tree | 6f3a7cb6ac940ee6e376552250f4524ce9b9125b /docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | |
| parent | 4cbb9a5bfdd906c6ebc4c2fc5b0ac4431602bee4 (diff) | |
| parent | 53443c5c712f4ec23b859105e94bcd90abc27762 (diff) | |
| download | kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.tar.gz kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.zip | |
Merge "Remove support for CentOS 7"
Diffstat (limited to 'docker/cloudkitty/cloudkitty-api/Dockerfile.j2')
| -rw-r--r-- | docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index 951b424f4..54c2b70cb 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -13,13 +13,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set cloudkitty_api_packages = [ 'httpd', 'mod_ssl', - 'openstack-cloudkitty-api' + 'openstack-cloudkitty-api', + 'python3-mod_wsgi' ] %} - {% if distro_python_version.startswith('3') %} - {% set cloudkitty_api_packages = cloudkitty_api_packages + ['python3-mod_wsgi'] %} - {% else %} - {% set cloudkitty_api_packages = cloudkitty_api_packages + ['mod_wsgi'] %} - {% endif %} {{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf @@ -37,12 +33,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set cloudkitty_api_packages = [ 'httpd', 'mod_ssl', + 'python3-mod_wsgi' ] %} - {% if distro_python_version.startswith('3') %} - {% set cloudkitty_api_packages = cloudkitty_api_packages + ['python3-mod_wsgi'] %} - {% else %} - {% set cloudkitty_api_packages = cloudkitty_api_packages + ['mod_wsgi'] %} - {% endif %} {{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf |