openstack/kolla
Code Issues Proposed changes

Merge "Add oslo_versionedobjects dependency for neutron"

Browse Source
This commit is contained in:
Jenkins 2015-08-19 14:59:23 +00:00 committed by Gerrit Code Review
commit d04ee6b68c
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/centos/binary/neutron/neutron-base/Dockerfile
View File

@ -6,4 +6,7 @@ RUN yum -y install openstack-neutron \
openvswitch \
&& yum clean all
# TODO (sdake): remove once RDO adds to the openstack-neutron package
RUN pip install oslo.versionedobjects
COPY config-sudoers.sh /opt/kolla/

3
docker_templates/neutron/neutron-base/Dockerfile.j2
View File

@ -9,6 +9,9 @@ RUN yum -y install openstack-neutron \
openvswitch \
&& yum clean all
# TODO (sdake): remove once RDO adds to the openstack-neutron package
RUN pip install oslo.versionedobjects
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \