diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-10-09 14:11:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-10-09 14:11:59 +0000 |
| commit | 2564b6aecdb4c582a7a25642596734a586a3e385 (patch) | |
| tree | 5feac2762801f867e637b605560d9f5ff6c57b05 /docker | |
| parent | c7981f6309fc830f26f83262dc6680811020a93d (diff) | |
| parent | b159c6f3894f33f1af9a9ad355679b91f85d498d (diff) | |
| download | kolla-2564b6aecdb4c582a7a25642596734a586a3e385.tar.gz kolla-2564b6aecdb4c582a7a25642596734a586a3e385.zip | |
Merge "cinder-api: handle Debian too"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index 07e4a7c48..ac9129eb5 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -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 \ && 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 = [ 'apache2', 'libapache2-mod-wsgi' |
