diff options
| author | Steven Dake <stdake@cisco.com> | 2015-10-07 22:19:08 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-10-07 22:20:28 -0700 |
| commit | 52eb4d84034ade58cb108fa19f2aa6562d9b82e5 (patch) | |
| tree | 483a8471017ed3eebd03524e320dd4a1ba852b0a /docker/neutron | |
| parent | 9d7177574bf585e201c662422bb24da5c90eb13a (diff) | |
| download | kolla-52eb4d84034ade58cb108fa19f2aa6562d9b82e5.tar.gz kolla-52eb4d84034ade58cb108fa19f2aa6562d9b82e5.zip | |
Remove an oslo.message 2.2.0 pin
In https://bugs.launchpad.net/kolla/+bug/1483667, oslo.messaging
was pinned to 2.2.0. This pin is no longer necessary as this bug
has been fixed upstream.
backport: liberty
TrivialFix
Change-Id: Ica9ae41876a754291d4c6ee1235f6e69a4213463
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 65e698ad4..738cf252a 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -1,16 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -# See bug: https://bugs.launchpad.net/kolla/+bug/1483667 -# TODO(SamYaple): Check in on this and remove once unneccesary -RUN pip install oslo.messaging==2.2.0 - - {% endif %} -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start |