openstack/kolla
Code Issues Proposed changes

Merge "cinder-api: handle Debian too"

Browse Source
This commit is contained in:
Jenkins
2017-10-09 14:11:59 +00:00
committed by Gerrit Code Review
parent c7981f6309 b159c6f389
commit 2564b6aecd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/cinder/cinder-api/Dockerfile.j2
View File

@@ -43,7 +43,7 @@ RUN mkdir -p /var/www/cgi-bin/cinder \
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set cinder_api_packages = [ {% set cinder_api_packages = [
'apache2', 'apache2',
'libapache2-mod-wsgi' 'libapache2-mod-wsgi'