Merge "Fix building centos kolla-toolbox"

33fd50e6 · Jenkins · Gerrit Code Review · eb3e9939 · 937c771e · 33fd50e6
Commit 33fd50e6 authored 9 years ago by Jenkins Committed by Gerrit Code Review 9 years ago
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -11,7 +11,6 @@ RUN yum -y install \
        libxml2-devel \
        libxslt-devel \
        mariadb-devel \
-        mariadb-libs \
        MariaDB-shared \
        openssl-devel \
        python-devel \

--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -5,7 +5,6 @@ MAINTAINER {{ maintainer }}
 RUN yum -y install \
        git \
        iproute \
-        mariadb-libs \
        openssl \
    && yum clean all