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/glance | |
| 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/glance')
| -rw-r--r-- | docker/glance/glance-base/Dockerfile.j2 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index f4d972f09..8a86f9906 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -11,14 +11,14 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set glance_base_packages = [ 'openstack-glance', - 'python-rbd', - 'python-rados' + 'python-rados', + 'python-rbd' ] %} {% elif base_distro in ['ubuntu'] %} {% set glance_base_packages = [ 'glance', - 'python-rbd', - 'python-rados' + 'python-rados', + 'python-rbd' ] %} {% endif %} @@ -26,8 +26,8 @@ MAINTAINER {{ maintainer }} {% elif install_type == 'source' %} {% set glance_base_packages = [ - 'python-rbd', - 'python-rados' + 'python-rados', + 'python-rbd' ] %} {{ macros.install_packages(glance_base_packages | customizable("packages")) }} |