From 5dd79bbbef1d886914a1bf77bb098442cfe522e4 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Fri, 29 Jan 2016 18:46:38 -0700
Subject: [PATCH] Make kolla-toolbox container build on CentOS bin

Ansible installs pytz from pip which is newer then then pytz in
RDO repositories.  As part of this process, it removes pytz
which corrupts the python installation in some way.  This causes
further pip usage to produce a backtrace causing the kolla-toolbox
container not to build.

Mixing pip and RPM is not good.

Change-Id: I413468641bad5476cfcba61cb0e2189c31f3d682
Closes-Bug: #1545215
---
 docker/kolla-toolbox/Dockerfile.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index fe80db6936..8d27d0ef07 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -16,7 +16,8 @@ RUN yum -y install \
         openssl-devel \
         python-devel \
         openssh-clients \
-    && yum clean all
+    && yum clean all \
+    && yum -y remove pytz
 
 {% elif base_distro in ['ubuntu', 'debian'] %}