From e6391aff36577dce40536f1b9c6692cd7df400d5 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Tue, 6 Oct 2015 11:05:52 -0700
Subject: [PATCH] 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
---
 docker/neutron/neutron-server/Dockerfile.j2 | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index 5fcf47a783..65e698ad40 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
@@ -4,22 +4,10 @@ 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 %}