aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-22 15:47:02 +0000
committerGerrit Code Review <review@openstack.org>2015-12-22 15:47:02 +0000
commit4a2e72868835b55c72ecbc6435599ff93158cc25 (patch)
tree3a17524763110013eae65363a8b56bc6618da1da /docker
parent386bcff4a191d501838684ab54f9668b3c1e3c9b (diff)
parent026942e9c55c3ebfd7eb5121d97cf67dc7451c7f (diff)
downloadkolla-4a2e72868835b55c72ecbc6435599ff93158cc25.tar.gz
kolla-4a2e72868835b55c72ecbc6435599ff93158cc25.zip
Merge "Convert to pymysql"
Diffstat (limited to 'docker')
-rw-r--r--docker/openstack-base/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 8532c4e3d..7d87a4bd2 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -26,6 +26,7 @@ RUN yum -y install \
python-manilaclient \
python-mistralclient \
python-muranoclient \
+ python-PyMySQL \
python-pip \
python-saharaclient \
python-swiftclient \
@@ -33,7 +34,6 @@ RUN yum -y install \
python-tuskarclient \
python-zaqarclient \
python-openstackclient \
- MySQL-python \
python-keystoneauth1 \
&& yum clean all
@@ -100,7 +100,7 @@ RUN ln -s openstack-base-source/* /requirements \
python-tuskarclient \
python-zaqarclient \
python-openstackclient \
- MySQL-python \
+ pymysql \
python-memcached \
six
ENV PATH /var/lib/kolla/venv/bin:$PATH