diff options
| author | Steven Dake <stdake@cisco.com> | 2015-10-06 11:05:52 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-10-06 21:50:44 -0700 |
| commit | e6391aff36577dce40536f1b9c6692cd7df400d5 (patch) | |
| tree | aef6233f9593614c3126b1c76d5545ede4d94ea8 /docker | |
| parent | c5b6a436bd1a93254a32a002239197c28b16841e (diff) | |
| download | kolla-e6391aff36577dce40536f1b9c6692cd7df400d5.tar.gz kolla-e6391aff36577dce40536f1b9c6692cd7df400d5.zip | |
Remove which from neutron-server
The which tool is installed in the base image now and this extra
install is duplicated and has no effect.
backport:liberty
TrivialFix
Change-Id: I70c3edb11f5c847063b6e4ab4f9de7184356ce57
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 5fcf47a78..65e698ad4 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -4,23 +4,11 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -# Install required packages -RUN yum install -y which \ - && yum clean all - # See bug: https://bugs.launchpad.net/kolla/+bug/1483667 # TODO(SamYaple): Check in on this and remove once unneccesary RUN pip install oslo.messaging==2.2.0 {% endif %} -{% elif install_type == 'source' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -#Install required packages -RUN yum install -y which \ - && yum clean all - - {% endif %} {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start |