diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-09 12:08:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-09 12:08:21 +0000 |
| commit | c83536cb39664e1a75cea06b1fd24a75ad2d9cfb (patch) | |
| tree | 73a1a78581b9e3c3952c39430134680cefbb4dbe | |
| parent | 90793fee226c0afa0e1d417cbe16c01b957746c3 (diff) | |
| parent | 0d273e077d8cbf448459245202dfc1913e1a5a1e (diff) | |
| download | kolla-c83536cb39664e1a75cea06b1fd24a75ad2d9cfb.tar.gz kolla-c83536cb39664e1a75cea06b1fd24a75ad2d9cfb.zip | |
Merge "mariadb-devel is deprecated"
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 20e692f77..466018e9d 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -9,7 +9,7 @@ RUN yum -y install \ libffi-devel \ libxml2-devel \ libxslt-devel \ - mariadb-devel \ + MariaDB-devel \ openssl-devel \ python-devel \ openssh-clients \ diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 60e72a5cc..186951487 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -76,7 +76,7 @@ RUN yum -y install \ libffi-devel \ libxml2-devel \ libxslt-devel \ - mariadb-devel \ + MariaDB-devel \ openldap-devel \ openssl-devel \ postgresql \ |