diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-07 06:27:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-07 06:27:58 +0000 |
| commit | 4fa1b3b5ff2da5a67522613b05bcb92204b380a2 (patch) | |
| tree | da78f995d711dfbd6fe9297ea4a6ae21dfb5555f /docker | |
| parent | 2e01ce50f54a03b9036d54b08f20074cea69bec0 (diff) | |
| parent | 579dc84e053490459b8641eef3f984c34e5ebe67 (diff) | |
| download | kolla-4fa1b3b5ff2da5a67522613b05bcb92204b380a2.tar.gz kolla-4fa1b3b5ff2da5a67522613b05bcb92204b380a2.zip | |
Merge "Install MySQL-python with pip in openstack-base container (type source)"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 99e7db355..4b9f91251 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -200,7 +200,6 @@ ENV DEBIAN_FRONTEND noninteractive 'libxslt-devel', 'libyaml-devel', 'MariaDB-devel', - 'MySQL-python', 'openldap-devel', 'openssl-devel', 'postgresql', @@ -274,6 +273,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ 'kombu', 'monotonic', 'msgpack-python', + 'MySQL-python', 'netaddr', 'netifaces', 'os-client-config', |