diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2017-03-23 20:06:50 +0000 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2017-03-28 16:45:16 +0100 |
| commit | 623e54da372563d068f0edf979b04996d70b306c (patch) | |
| tree | 10418a89eaed60e17cf0b01a472fc9fe146f9041 /docker/keystone | |
| parent | ce716ebe228a29f37fbdfc69aaa34413e6f409a5 (diff) | |
| download | kolla-623e54da372563d068f0edf979b04996d70b306c.tar.gz kolla-623e54da372563d068f0edf979b04996d70b306c.zip | |
Alphabetize packages
Some images have packages sorted alphabetically and some not.
Unify common style between all images.
Change-Id: I906ed89c10b12886665618752f525ba71d83d991
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")) }} |