From 17e0de6aa6c32c5adebeffc90c96f15285877cf5 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Thu, 24 Mar 2016 01:34:32 -0400
Subject: [PATCH] Fix consistently failing CentOS gate

This fixes a gate regression and probably regression in general
with building images.  I'm not sure where the regression came from,
but I suspect a new verson of MySQL-python from pip is to blame.

Closes-Bug: #1561347
Change-Id: Ib502d0090a3fc3b3ea5d27a91ff59df1f53c01a3
---
 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 22705de7af..f01a1e73b9 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -10,6 +10,7 @@ RUN yum -y install \
         libxml2-devel \
         libxslt-devel \
         MariaDB-devel \
+        MySQL-python \
         openssl-devel \
         python-devel \
         openssh-clients \
@@ -26,6 +27,7 @@ RUN apt-get -y --no-install-recommends install \
         libmariadbclient-dev \
         libssl-dev \
         libxslt1-dev \
+        python-mysqldb \
         python-dev \
     && apt-get clean
 
@@ -35,7 +37,6 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
     && python get-pip.py \
     && rm get-pip.py \
     && pip --no-cache-dir install \
-        MySQL-python \
         os-client-config==1.16.0 \
         pyudev \
         shade==1.4.0