From 52eb4d84034ade58cb108fa19f2aa6562d9b82e5 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Wed, 7 Oct 2015 22:19:08 -0700
Subject: [PATCH] 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
---
 docker/neutron/neutron-server/Dockerfile.j2 | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index 65e698ad40..738cf252a7 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