diff options
Diffstat (limited to 'docker/cloudkitty/cloudkitty-api')
| -rw-r--r-- | docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index 148ce9871..95656dbc7 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -11,9 +11,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set cloudkitty_api_packages = [ 'httpd', 'mod_ssl', - 'mod_wsgi', - 'openstack-cloudkitty-api', + 'openstack-cloudkitty-api' ] %} + {% 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 @@ -31,8 +35,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set cloudkitty_api_packages = [ 'httpd', 'mod_ssl', - '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 |