diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-08-03 13:13:52 +0000 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-08-11 13:46:05 +0000 |
| commit | 99cf9465f8307d9fb99a4c14d72e63a0df833b58 (patch) | |
| tree | 7765bc0cf8a78fe23e7d66e8d1b5d5d79c1383f8 /docker/cinder/cinder-api | |
| parent | 495a905b8032b4d3c68246be204384da2b0f3c3d (diff) | |
| download | kolla-99cf9465f8307d9fb99a4c14d72e63a0df833b58.tar.gz kolla-99cf9465f8307d9fb99a4c14d72e63a0df833b58.zip | |
Customizations for Cinder
Implement the new Jinja2 based templating patterns for Cinder, as
outlined in the below blueprint.
Change-Id: I8d0131aff9cc406bd80ce384003308aee672412a
Partially-implements: blueprint third-party-plugin-support
Diffstat (limited to 'docker/cinder/cinder-api')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index 2b2414b8d..3d8d08259 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -1,25 +1,33 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} MAINTAINER {{ maintainer }} +{% import "macros.j2" as macros with context %} + {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum -y install \ - python-keystone \ - && yum clean all + {% set cinder_api_packages = [ + 'python-keystone' + ] %} + {% elif base_distro in ['ubuntu'] %} -RUN apt-get -y install --no-install-recommends \ - cinder-api \ - && apt-get clean + {% set cinder_api_packages = [ + 'cinder-api' + ] %} {% endif %} + +RUN {{ macros.install_packages(cinder_api_packages | customizable("packages")) }} + {% endif %} COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start RUN chmod 755 /usr/local/bin/kolla_cinder_extend_start +{% block cinder_api_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER cinder |