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-base | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
Diffstat (limited to 'docker/cinder/cinder-base')
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 531637b76..5e3052058 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -10,15 +10,15 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set cinder_base_packages = [ - 'openstack-cinder', - 'python-automaton', + 'ceph-common', 'lvm2', - 'ceph-common' + 'openstack-cinder', + 'python-automaton' ] %} {% elif base_distro in ['ubuntu'] %} {% set cinder_base_packages = [ - 'cinder-common', 'ceph-common', + 'cinder-common', 'lvm2' ] %} {% endif %} @@ -27,15 +27,15 @@ MAINTAINER {{ maintainer }} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set cinder_base_packages = [ + 'ceph-common', 'lvm2', - 'qemu-img', - 'ceph-common' + 'qemu-img' ] %} {% elif base_distro in ['ubuntu', 'debian'] %} {% set cinder_base_packages = [ + 'ceph-common', 'lvm2', - 'qemu-utils', - 'ceph-common' + 'qemu-utils' ] %} {% endif %} {{ macros.install_packages(cinder_base_packages | customizable("packages")) }} |
