From 22655a19c9ea388a03c7db06400c135b0847cbfb Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 18 Aug 2015 14:33:16 -0700 Subject: [PATCH] Add oslo_versionedobjects dependency for neutron RDO doesn't keep their RPM dependencies up to date with latest neutron changes to requirements.txt, so we have to pip install the package. Change-Id: Ic49a4dd3b85e9daf60c87b245b9784818fcb3bb2 Closes-Bug: #1486241 --- docker/centos/binary/neutron/neutron-base/Dockerfile | 3 +++ docker_templates/neutron/neutron-base/Dockerfile.j2 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/docker/centos/binary/neutron/neutron-base/Dockerfile b/docker/centos/binary/neutron/neutron-base/Dockerfile index 56b9b7bf23..b5a0639b49 100644 --- a/docker/centos/binary/neutron/neutron-base/Dockerfile +++ b/docker/centos/binary/neutron/neutron-base/Dockerfile @@ -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/ diff --git a/docker_templates/neutron/neutron-base/Dockerfile.j2 b/docker_templates/neutron/neutron-base/Dockerfile.j2 index dd47fcb655..63d798b217 100644 --- a/docker_templates/neutron/neutron-base/Dockerfile.j2 +++ b/docker_templates/neutron/neutron-base/Dockerfile.j2 @@ -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 }}' \