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/keystone | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index a4d98efa4..2f06dc1b6 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -10,12 +10,12 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set keystone_base_packages = [ - 'openstack-keystone', - 'python-keystoneclient', 'httpd', - 'mod_wsgi', 'mod_ssl', - 'python-ldappool' + 'mod_wsgi', + 'openstack-keystone', + 'python-ldappool', + 'python-keystoneclient' ] %} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }} @@ -27,8 +27,8 @@ RUN mkdir -p /var/www/cgi-bin/keystone \ {% elif base_distro in ['ubuntu'] %} {% set keystone_base_packages = [ - 'keystone', 'apache2', + 'keystone', 'libapache2-mod-wsgi', 'python-ldappool' ] %} @@ -45,8 +45,8 @@ RUN mkdir -p /var/www/cgi-bin/keystone \ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set keystone_base_packages = [ 'httpd', - 'mod_wsgi', 'mod_ssl', + 'mod_wsgi', 'python-ldappool' ] %} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }} |