Merge "Remove maridb client from base image"

docker_templates/base/Dockerfile.j2

@@ -7,6 +7,13 @@ ENV KOLLA_BASE_DISTRO {{ base_distro }}
 ENV KOLLA_INSTALL_TYPE {{ install_type }}
 
 {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+# Turns on galera repos throughout the build
+COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo
+
+RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm \
+    && sed -i 's|$releasever|centos/latest|g' /etc/yum.repos.d/percona-release.repo
+
     {% if install_type == 'binary' %}
         {% if base_distro in ['centos', 'oraclelinux'] %}
 
@@ -57,7 +64,6 @@ RUN yum update -y \
 RUN yum install -y \
         git \
         iproute \
-        mariadb \
         mariadb-libs \
         openssl \
         openstack-utils \
@@ -165,7 +171,6 @@ RUN yum update -y \
         libffi-devel \
         libxml2-devel \
         libxslt-devel \
-        mariadb \
         mariadb-devel \
         mysql-devel \
         MySQL-python \

docker_templates/base/mariadb.yum.repo

@@ -0,0 +1,5 @@
+[mariadb]
+name = MariaDB
+baseurl = http://yum.mariadb.org/10.0/centos7-amd64
+gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
+gpgcheck=1

docker_templates/galera/Dockerfile.j2

@@ -3,15 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
 
-RUN echo "[mariadb]" > /etc/yum.repos.d/MariaDB.repo && \
+RUN yum install -y \
-    echo "name = MariaDB" >> /etc/yum.repos.d/MariaDB.repo && \
-    echo "baseurl = http://yum.mariadb.org/10.0/centos7-amd64" >> /etc/yum.repos.d/MariaDB.repo && \
-    echo "gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB" >> /etc/yum.repos.d/MariaDB.repo && \
-    echo "gpgcheck=1" >> /etc/yum.repos.d/MariaDB.repo
-
-RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm \
-    && sed -i 's|$releasever|centos/latest|g' /etc/yum.repos.d/percona-release.repo \
-    && yum install -y \
         MariaDB-Galera-server \
         MariaDB-client \
         rsync \