diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-08 03:07:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-08 03:07:02 +0000 |
| commit | 9d7177574bf585e201c662422bb24da5c90eb13a (patch) | |
| tree | a96c626990dc53bed000583cce2cade8be632675 | |
| parent | c4888d3310c56b36c815dc4b8748913b30319a95 (diff) | |
| parent | e6391aff36577dce40536f1b9c6692cd7df400d5 (diff) | |
| download | kolla-9d7177574bf585e201c662422bb24da5c90eb13a.tar.gz kolla-9d7177574bf585e201c662422bb24da5c90eb13a.zip | |
Merge "Remove which from neutron-server"
| -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 |