diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-18 14:33:16 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-18 14:35:33 -0700 |
| commit | 22655a19c9ea388a03c7db06400c135b0847cbfb (patch) | |
| tree | aa0c711c6d06a347a4ed9277e8e59d528ad0fa51 | |
| parent | 718db54fa80bbd892670a7a5c1eca5ad991f53eb (diff) | |
| download | kolla-22655a19c9ea388a03c7db06400c135b0847cbfb.tar.gz kolla-22655a19c9ea388a03c7db06400c135b0847cbfb.zip | |
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
| -rw-r--r-- | docker/centos/binary/neutron/neutron-base/Dockerfile | 3 | ||||
| -rw-r--r-- | docker_templates/neutron/neutron-base/Dockerfile.j2 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/docker/centos/binary/neutron/neutron-base/Dockerfile b/docker/centos/binary/neutron/neutron-base/Dockerfile index 56b9b7bf2..b5a0639b4 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 dd47fcb65..63d798b21 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 }}' \ |