openstack/kolla-ansible
Code Issues Proposed changes

Merge "Heat doesn't need to specify python-oslo-reports"

Browse Source
This commit is contained in:
Jenkins 2015-09-28 11:07:58 +00:00 committed by Gerrit Code Review
commit a0ac876494
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %} {% if install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install python-oslo-reports \
&& yum clean all
{% endif %}
{% elif install_type == 'source' %}
ADD heat-base-archive /heat-base-source ADD heat-base-archive /heat-base-source
RUN ln -s heat-base-source/* heat \ RUN ln -s heat-base-source/* heat \