openstack/kolla
Code Issues Proposed changes

Merge "Customizations for heat"

Browse Source
This commit is contained in:
Jenkins 2016-07-22 22:26:25 +00:00 committed by Gerrit Code Review
commit db4e2875b3
3 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/heat/heat-api/Dockerfile.j2
View File

@ -1,25 +1,21 @@
FROM {{ namespace }}/{{ image_prefix }}heat-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 \
openstack-heat-api \
&& yum clean all
{% set heat_api_packages = ['openstack-heat-api'] %}
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
heat-api \
&& apt-get clean
{% set heat_api_packages = ['heat-api'] %}
{% endif %}
RUN {{ macros.install_packages(heat_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start
RUN chmod 755 /usr/local/bin/kolla_heat_extend_start
{% block heat_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}
USER heat

19
docker/heat/heat-base/Dockerfile.j2
View File

@ -1,20 +1,17 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-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 \
openstack-heat-common \
&& yum clean all
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set heat_base_packages = ['openstack-heat-common'] %}
{% elif base_distro in ['ubuntu'] %}
{% set heat_base_packages = ['heat-common'] %}
{% endif %}
RUN {{ macros.install_packages(heat_base_packages | customizable("packages")) }}
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
heat-common \
&& apt-get clean
{% endif %}
{% elif install_type == 'source' %}
ADD heat-base-archive /heat-base-source

26
docker/heat/heat-engine/Dockerfile.j2
View File

@ -1,25 +1,23 @@
FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
# TODO(SamYaple): until packaging is fixed, all of the python clients below are required
# http://pkgs.fedoraproject.org/cgit/openstack-heat.git/tree/openstack-heat.spec#n248
RUN yum -y install \
python-barbicanclient \
python-zaqarclient \
openstack-heat-engine \
&& yum clean all
{% set heat_engine_packages = [
'python-barbicanclient',
'python-zaqarclient',
'openstack-heat-engine'
] %}
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
heat-engine \
&& apt-get clean
{% set heat_engine_packages = ['heat-engine'] %}
{% endif %}
RUN {{ macros.install_packages(heat_engine_packages | customizable("packages")) }}
{% endif %}
{% block heat_engine_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}