diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 11:07:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 11:07:58 +0000 |
| commit | a0ac8764948f2dba28f648d053cd0a68d8c3e78d (patch) | |
| tree | dc556d7ba940aebefa006871ba7efaceac7db45a | |
| parent | 3b6261a21a9d4c50779f488198a38f40bca6e1c9 (diff) | |
| parent | 473a0229d4cb3ee9865ac864df29f8d27edf1937 (diff) | |
| download | kolla-a0ac8764948f2dba28f648d053cd0a68d8c3e78d.tar.gz kolla-a0ac8764948f2dba28f648d053cd0a68d8c3e78d.zip | |
Merge "Heat doesn't need to specify python-oslo-reports"
| -rw-r--r-- | docker/heat/heat-base/Dockerfile.j2 | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 00ca07f3b..e4acffcf1 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -1,14 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install python-oslo-reports \ - && yum clean all - - {% endif %} -{% elif install_type == 'source' %} +{% if install_type == 'source' %} ADD heat-base-archive /heat-base-source RUN ln -s heat-base-source/* heat \ |