diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-03 16:17:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-03 16:17:58 +0000 |
| commit | 2d278ea347feb254232295b69a90955b588698c3 (patch) | |
| tree | f42d3dcc6f66af30f7501fac8b07d28b4301008c /docker/cinder/cinder-api | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
Diffstat (limited to 'docker/cinder/cinder-api')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index a99dba4bd..828dcd943 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -8,18 +8,18 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set cinder_api_packages = [ - 'python-keystone', 'httpd', + 'mod_ssl', 'mod_wsgi', - 'mod_ssl' + 'python-keystone' ] %} {{ macros.install_packages(cinder_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 {% elif base_distro in ['ubuntu'] %} {% set cinder_api_packages = [ - 'cinder-api', 'apache2', + 'cinder-api', 'libapache2-mod-wsgi' ] %} {{ macros.install_packages(cinder_api_packages | customizable("packages")) }} @@ -30,8 +30,8 @@ RUN echo > /etc/apache2/ports.conf {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set cinder_api_packages = [ 'httpd', - 'mod_wsgi', - 'mod_ssl' + 'mod_ssl', + 'mod_wsgi' ] %} {{ macros.install_packages(cinder_api_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ |