aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-placement-api
diff options
context:
space:
mode:
Diffstat (limited to 'docker/nova/nova-placement-api')
-rw-r--r--docker/nova/nova-placement-api/Dockerfile.j212
1 files changed, 10 insertions, 2 deletions
diff --git a/docker/nova/nova-placement-api/Dockerfile.j2 b/docker/nova/nova-placement-api/Dockerfile.j2
index ef76e4fb9..5c37e0a23 100644
--- a/docker/nova/nova-placement-api/Dockerfile.j2
+++ b/docker/nova/nova-placement-api/Dockerfile.j2
@@ -11,9 +11,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set nova_placement_api_packages = [
'httpd',
'mod_ssl',
- 'mod_wsgi',
'openstack-nova-placement-api'
] %}
+ {% if distro_python_version.startswith('3') %}
+ {% set nova_placement_api_packages = nova_placement_api_packages + ['python3-mod_wsgi'] %}
+ {% else %}
+ {% set nova_placement_api_packages = nova_placement_api_packages + ['mod_wsgi'] %}
+ {% endif %}
{{ macros.install_packages(nova_placement_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
@@ -37,8 +41,12 @@ RUN truncate -s 0 /etc/apache2/ports.conf
{% set nova_placement_api_packages = [
'httpd',
'mod_ssl',
- 'mod_wsgi'
] %}
+ {% if distro_python_version.startswith('3') %}
+ {% set nova_placement_api_packages = nova_placement_api_packages + ['python3-mod_wsgi'] %}
+ {% else %}
+ {% set nova_placement_api_packages = nova_placement_api_packages + ['mod_wsgi'] %}
+ {% endif %}
{{ macros.install_packages(nova_placement_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \