diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-15 10:52:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-15 10:52:12 +0000 |
| commit | 7f22109d06aaa6e0d6105c6416eeff1f0ae38362 (patch) | |
| tree | 8d4365b60bd4f7e334b143fea283de00ec57932d | |
| parent | 5d762a117a88d18be85eb85999debfdacab94f15 (diff) | |
| parent | b5878b2449028d1078c0ffca3ca7c114fff41e40 (diff) | |
| download | kolla-7f22109d06aaa6e0d6105c6416eeff1f0ae38362.tar.gz kolla-7f22109d06aaa6e0d6105c6416eeff1f0ae38362.zip | |
Merge "Fix MySQL-python build on Centos"
| -rw-r--r-- | docker/kolla-ansible/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docker/kolla-ansible/Dockerfile.j2 b/docker/kolla-ansible/Dockerfile.j2 index 1d0228d54..d38257e4d 100644 --- a/docker/kolla-ansible/Dockerfile.j2 +++ b/docker/kolla-ansible/Dockerfile.j2 @@ -3,6 +3,7 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} +# TODO(mandre) remove MariaDB-shared once Percona has fixed its packaging issue RUN yum -y install \ gcc \ git \ @@ -11,6 +12,7 @@ RUN yum -y install \ libxslt-devel \ mariadb-devel \ mariadb-libs \ + MariaDB-shared \ openssl-devel \ python-devel \ openssh-clients \ diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 3a7e87604..8532c4e3d 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -2,11 +2,12 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} +# TODO(mandre) remove MariaDB-shared once Percona has fixed its packaging issue RUN yum -y install \ git \ iproute \ mariadb-libs \ - MySQL-python \ + MariaDB-shared \ openssl \ && yum clean all {% endif %} |