openstack/kolla-ansible
Code Issues Proposed changes

Merge "Install the required packages for ceph-base image"

Browse Source
This commit is contained in:
Jenkins 2016-09-28 15:43:02 +00:00 committed by Gerrit Code Review
commit 1432046728
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/ceph/ceph-base/Dockerfile.j2
View File

@ -11,7 +11,9 @@ MAINTAINER {{ maintainer }}
'ceph-radosgw', 'ceph-radosgw',
'parted', 'parted',
'hdparm', 'hdparm',
'btrfs-progs' 'btrfs-progs',
'xfsprogs',
'e2fsprogs'
] %} ] %}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set ceph_base_packages = [ {% set ceph_base_packages = [
@ -19,7 +21,9 @@ MAINTAINER {{ maintainer }}
'radosgw', 'radosgw',
'parted', 'parted',
'hdparm', 'hdparm',
'btrfs-tools' 'btrfs-tools',
'xfsprogs',
'e2fsprogs'
] %} ] %}
{% endif %} {% endif %}
{{ macros.install_packages(ceph_base_packages | customizable("packages")) }} {{ macros.install_packages(ceph_base_packages | customizable("packages")) }}