diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-15 15:54:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-15 15:54:04 +0000 |
| commit | 06c09562d95e8089f1ac74dfc3e65db213cca9cc (patch) | |
| tree | 8abbf41c680ccf645dfd6a6c8fd8c867c2317218 | |
| parent | ec569e752d7464307c40aa371fd4ef8788ed8737 (diff) | |
| parent | 304c69a91f026036b6530a58de6383dc5fa8b38e (diff) | |
| download | kolla-06c09562d95e8089f1ac74dfc3e65db213cca9cc.tar.gz kolla-06c09562d95e8089f1ac74dfc3e65db213cca9cc.zip | |
Merge "Customizations for Ceph"
| -rw-r--r-- | docker/ceph/ceph-base/Dockerfile.j2 | 38 | ||||
| -rw-r--r-- | docker/ceph/ceph-mon/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ceph/ceph-osd/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ceph/ceph-rgw/Dockerfile.j2 | 2 |
4 files changed, 26 insertions, 18 deletions
diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index 45ba62b9b..ce354587c 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -1,27 +1,25 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} +{% import "macros.j2" as macros with context %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install \ - ceph \ - ceph-radosgw \ - parted \ - hdparm \ - btrfs-progs \ - && yum clean all - + {% set ceph_base_packages = [ + 'ceph', + 'ceph-radosgw', + 'parted', + 'hdparm', + 'btrfs-progs' + ] %} {% elif base_distro in ['ubuntu', 'debian'] %} - -RUN apt-get -y install --no-install-recommends \ - ceph \ - radosgw \ - parted \ - hdparm \ - btrfs-tools \ - && apt-get clean - + {% set ceph_base_packages = [ + 'ceph', + 'radosgw', + 'parted', + 'hdparm', + 'btrfs-tools' + ] %} {% endif %} +RUN {{ macros.install_packages(ceph_base_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start @@ -29,3 +27,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start RUN useradd --user-group ceph \ && mkdir -p /home/ceph \ && chown -R ceph: /home/ceph + +{% block ceph_base_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} diff --git a/docker/ceph/ceph-mon/Dockerfile.j2 b/docker/ceph/ceph-mon/Dockerfile.j2 index 38c8d26f6..f0c084f6b 100644 --- a/docker/ceph/ceph-mon/Dockerfile.j2 +++ b/docker/ceph/ceph-mon/Dockerfile.j2 @@ -6,4 +6,6 @@ COPY fetch_ceph_keys.py /usr/bin/ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/bin/fetch_ceph_keys.py +{% block ceph_mon_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} diff --git a/docker/ceph/ceph-osd/Dockerfile.j2 b/docker/ceph/ceph-osd/Dockerfile.j2 index 03e4dceda..41c0b6d20 100644 --- a/docker/ceph/ceph-osd/Dockerfile.j2 +++ b/docker/ceph/ceph-osd/Dockerfile.j2 @@ -4,4 +4,6 @@ MAINTAINER {{ maintainer }} COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start +{% block ceph_osd_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} diff --git a/docker/ceph/ceph-rgw/Dockerfile.j2 b/docker/ceph/ceph-rgw/Dockerfile.j2 index cf6000906..ccdbdebf7 100644 --- a/docker/ceph/ceph-rgw/Dockerfile.j2 +++ b/docker/ceph/ceph-rgw/Dockerfile.j2 @@ -1,4 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block ceph_rgw_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} |