diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-07 10:33:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-07 10:33:46 +0000 |
| commit | 3b8e60079410fc00e26091e09b30047dca3c21f0 (patch) | |
| tree | 284b840f957789de6d8a12055cc86b318d50a06d | |
| parent | 1bc3e469752ba4e6eb9fdacb59c42fe7b21c8b44 (diff) | |
| parent | 8d96569fd866e4d8adf4266ca8fba853d9ee6ac8 (diff) | |
| download | kolla-3b8e60079410fc00e26091e09b30047dca3c21f0.tar.gz kolla-3b8e60079410fc00e26091e09b30047dca3c21f0.zip | |
Merge "Fix neutron-server for centos-binary"
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 52fe24af7..a305d198f 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -4,10 +4,12 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} +# TODO(mandre) remove python-oslo-reports once RDO package is fixed RUN yum -y install \ openstack-neutron \ openstack-neutron-ml2 \ openvswitch \ + python-oslo-reports \ && yum clean all {% elif base_distro in ['ubuntu'] %} |