openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update Heat dockerfiles for formatting"

Browse Source
This commit is contained in:
Jenkins 2016-04-13 07:48:09 +00:00 committed by Gerrit Code Review
commit 725505c906
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/heat/heat-api-cfn/Dockerfile.j2
View File

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install openstack-heat-api-cfn \ RUN yum -y install \
openstack-heat-api-cfn \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}

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

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install openstack-heat-api \ RUN yum -y install \
openstack-heat-api \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}