Merge "use http instead of https for getting mariadb key"

docker/base/Dockerfile.j2

@@ -48,7 +48,7 @@ COPY ceph.yum.repo /etc/yum.repos.d/ceph.repo
 
 RUN yum -y install http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-3.noarch.rpm
 
-RUN rpm --import https://yum.mariadb.org/RPM-GPG-KEY-MariaDB \
+RUN rpm --import http://yum.mariadb.org/RPM-GPG-KEY-MariaDB \
     && rpm --import https://download.ceph.com/keys/release.asc \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Percona
 

docker/base/mariadb.yum.repo

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