aboutsummaryrefslogtreecommitdiff
path: root/docker/ceph
diff options
context:
space:
mode:
authorEduardo Gonzalez <dabarren@gmail.com>2017-03-23 20:06:50 +0000
committerEduardo Gonzalez <dabarren@gmail.com>2017-03-28 16:45:16 +0100
commit623e54da372563d068f0edf979b04996d70b306c (patch)
tree10418a89eaed60e17cf0b01a472fc9fe146f9041 /docker/ceph
parentce716ebe228a29f37fbdfc69aaa34413e6f409a5 (diff)
downloadkolla-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/ceph')
-rw-r--r--docker/ceph/ceph-base/Dockerfile.j218
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")) }}