openstack/kolla-ansible
Code Issues Proposed changes

use http instead of https for getting mariadb key

Browse Source 
yum.mariadb.org intermittent ssl certificate ca bundle has problem
for now.
https://mariadb.atlassian.net/browse/MDEV-9435

Change-Id: Ic0dd72c4586958224c03572ca9de0ea15a7a38fd
Closes-Bug: #1536066
This commit is contained in:
Allen Gao 2016-01-20 17:04:05 +08:00
parent 7609cc2428
commit 80dfcd0694
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

@ -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 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 https://download.ceph.com/keys/release.asc \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Percona && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Percona

4
docker/base/mariadb.yum.repo
View File

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