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/ceph | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
Diffstat (limited to 'docker/ceph')
| -rw-r--r-- | docker/ceph/ceph-base/Dockerfile.j2 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index 9b53abd4d..1adcd5731 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -9,25 +9,25 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ceph_base_packages = [ + 'btrfs-progs', 'ceph', 'ceph-fuse', 'ceph-radosgw', - 'parted', + 'e2fsprogs', 'hdparm', - 'btrfs-progs', - 'xfsprogs', - 'e2fsprogs' + 'parted', + 'xfsprogs' ] %} {% elif base_distro in ['ubuntu', 'debian'] %} {% set ceph_base_packages = [ + 'btrfs-tools', 'ceph', 'ceph-fuse', - 'radosgw', - 'parted', + 'e2fsprogs', 'hdparm', - 'btrfs-tools', - 'xfsprogs', - 'e2fsprogs' + 'parted', + 'radosgw', + 'xfsprogs' ] %} {% endif %} {{ macros.install_packages(ceph_base_packages | customizable("packages")) }} |