From 937c771ec8cb0afdcae2b0b499b7f93f669d4221 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Date: Mon, 22 Feb 2016 07:32:47 +0800
Subject: [PATCH] Fix building centos kolla-toolbox
Percona recently updated their package which is now conflicting with
mariadb-libs.
Closes-Bug: #1548589
Change-Id: I9db7ffb8b94b623784cffa3e63804c47375097d1
---
docker/kolla-toolbox/Dockerfile.j2 | 1 -
docker/openstack-base/Dockerfile.j2 | 1 -
2 files changed, 2 deletions(-)
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 1c6cebb2be..031f8d824d 100644
--- 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 \
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index d1a91d7364..60e72a5cc9 100644
--- 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