aboutsummaryrefslogtreecommitdiff
path: root/docker_templates
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-19 14:59:23 +0000
committerGerrit Code Review <review@openstack.org>2015-08-19 14:59:23 +0000
commitd04ee6b68c4e6d516e05834d56c375a78613ece4 (patch)
tree668e95bfed45817dc67cbace4cf43f3f15e8e521 /docker_templates
parent1c2cb5333c5a4cba7cc41e9d0eac5acbe40ffa45 (diff)
parent22655a19c9ea388a03c7db06400c135b0847cbfb (diff)
downloadkolla-d04ee6b68c4e6d516e05834d56c375a78613ece4.tar.gz
kolla-d04ee6b68c4e6d516e05834d56c375a78613ece4.zip
Merge "Add oslo_versionedobjects dependency for neutron"
Diffstat (limited to 'docker_templates')
-rw-r--r--docker_templates/neutron/neutron-base/Dockerfile.j23
1 files changed, 3 insertions, 0 deletions
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 }}' \