openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix neutron-server for centos-binary"

Browse Source
This commit is contained in:
Jenkins 2016-01-07 10:33:45 +00:00 committed by Gerrit Code Review
commit 3b8e600794
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -4,10 +4,12 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
# TODO(mandre) remove python-oslo-reports once RDO package is fixed
RUN yum -y install \ RUN yum -y install \
openstack-neutron \ openstack-neutron \
openstack-neutron-ml2 \ openstack-neutron-ml2 \
openvswitch \ openvswitch \
python-oslo-reports \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}