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/glance | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
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")) }} |