openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove which from neutron-server"

Browse Source
This commit is contained in:
Jenkins 2015-10-08 03:07:02 +00:00 committed by Gerrit Code Review
commit 9d7177574b
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/neutron/neutron-server/Dockerfile.j2
View File

@ -4,22 +4,10 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla)
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% 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 # See bug: https://bugs.launchpad.net/kolla/+bug/1483667
# TODO(SamYaple): Check in on this and remove once unneccesary # TODO(SamYaple): Check in on this and remove once unneccesary
RUN pip install oslo.messaging==2.2.0 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 %}
{% endif %} {% endif %}