diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-19 14:59:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-19 14:59:23 +0000 |
| commit | d04ee6b68c4e6d516e05834d56c375a78613ece4 (patch) | |
| tree | 668e95bfed45817dc67cbace4cf43f3f15e8e521 | |
| parent | 1c2cb5333c5a4cba7cc41e9d0eac5acbe40ffa45 (diff) | |
| parent | 22655a19c9ea388a03c7db06400c135b0847cbfb (diff) | |
| download | kolla-d04ee6b68c4e6d516e05834d56c375a78613ece4.tar.gz kolla-d04ee6b68c4e6d516e05834d56c375a78613ece4.zip | |
Merge "Add oslo_versionedobjects dependency for neutron"
| -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 }}' \ |