diff options
| author | Sam Yaple <sam@yaple.net> | 2016-03-24 12:37:03 +0000 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2016-03-28 20:54:55 -0400 |
| commit | 3f707d78df08badac2a9a289ca498cc7cb684b4f (patch) | |
| tree | c49234a362afa3f41c4ca78b88a313c857243c43 | |
| parent | 834b5eff5c1e3768fdc829128cae0b0955420bcd (diff) | |
| download | kolla-3f707d78df08badac2a9a289ca498cc7cb684b4f.tar.gz kolla-3f707d78df08badac2a9a289ca498cc7cb684b4f.zip | |
Revert "Fix consistently failing CentOS gate"
This reverts commit 17e0de6aa6c32c5adebeffc90c96f15285877cf5.
This change should have never merged. There is something else going on
here and the bug doesnt fully invetigate the issue. Using a mix of
system and pip packages is not acceptable and can cause problems.
In this case the packaged mysql has a KNOWN issue that we fixed in
liberty by switching to the pip installed package.
Change-Id: Ie10116010156c13742a0a5d37c440c713e4698e5
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index f01a1e73b..22705de7a 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -10,7 +10,6 @@ RUN yum -y install \ libxml2-devel \ libxslt-devel \ MariaDB-devel \ - MySQL-python \ openssl-devel \ python-devel \ openssh-clients \ @@ -27,7 +26,6 @@ RUN apt-get -y --no-install-recommends install \ libmariadbclient-dev \ libssl-dev \ libxslt1-dev \ - python-mysqldb \ python-dev \ && apt-get clean @@ -37,6 +35,7 @@ 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 |