diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-19 02:06:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-19 02:06:23 +0000 |
| commit | a75b615ff49625a9d7bb60d9b13cadeecabd3c86 (patch) | |
| tree | d578ec1b3d91e93e3e247a828f0136250b6d218b | |
| parent | 34bff50602c14c8370b077274f2aea1461c4bc49 (diff) | |
| parent | efd9065d78fd7066421f462db74202a7f16560a9 (diff) | |
| download | kolla-a75b615ff49625a9d7bb60d9b13cadeecabd3c86.tar.gz kolla-a75b615ff49625a9d7bb60d9b13cadeecabd3c86.zip | |
Merge "Customizations for zaqar"
| -rw-r--r-- | docker/zaqar/Dockerfile.j2 | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/docker/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2 index 0623ce92c..0d4e9d75d 100644 --- a/docker/zaqar/Dockerfile.j2 +++ b/docker/zaqar/Dockerfile.j2 @@ -1,21 +1,20 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install \ - openstack-zaqar \ - && yum clean all +{% import "macros.j2" as macros with context %} - {% elif base_distro in ['ubuntu'] %} +{% if install_type == 'binary' %} -RUN apt-get -y install --no-install-recommends \ - zaqar-common \ - zaqar-server \ - && apt-get clean +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% set zaqar_packages = ['openstack-zaqar'] %} +{% elif base_distro in ['ubuntu'] %} + {% set zaqar_packages = [ + 'zaqar-common', + 'zaqar-server' + ] %} +{% endif %} +RUN {{ macros.install_packages(zaqar_packages | customizable("packages")) }} - {% endif %} {% elif install_type == 'source' %} ADD zaqar-archive /zaqar-source @@ -32,6 +31,8 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start \ && usermod -a -G kolla zaqar +{% block zaqar_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER zaqar |