diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-30 14:59:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-30 14:59:46 +0000 |
| commit | 2068bc009a73a60daa0b88ca628a58dbdb3513ad (patch) | |
| tree | d287e58cefaf806414297941858a73cef4377538 /docker | |
| parent | 94e5616464f64f2a7a96ca7731558d70c9379d6a (diff) | |
| parent | 3f707d78df08badac2a9a289ca498cc7cb684b4f (diff) | |
| download | kolla-2068bc009a73a60daa0b88ca628a58dbdb3513ad.tar.gz kolla-2068bc009a73a60daa0b88ca628a58dbdb3513ad.zip | |
Merge "Revert "Fix consistently failing CentOS gate""
Diffstat (limited to 'docker')
| -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 |