diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-23 06:55:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-23 06:55:01 +0000 |
| commit | 9d47c13a545bdbab1c143c31d300025a54aeb984 (patch) | |
| tree | 069ad61e09ffbfceb432377ba5fddc30ec2a0729 /docker/base | |
| parent | 5ea4cf417129cefe91f54cbfdc70bb20ca70bce6 (diff) | |
| parent | a729d132d6a8a891dc0ab92c9bda094a59cea231 (diff) | |
| download | kolla-9d47c13a545bdbab1c143c31d300025a54aeb984.tar.gz kolla-9d47c13a545bdbab1c143c31d300025a54aeb984.zip | |
Merge "Consume RDO packaged mariadb version"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/base/MariaDB.repo | 5 |
2 files changed, 0 insertions, 12 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2b4b67641..a3678f589 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -65,7 +65,6 @@ COPY yum.conf /etc/yum.conf 'grafana.repo', 'influxdb.repo', 'kibana.yum.repo', - 'MariaDB.repo', 'nfs_ganesha.repo', 'opendaylight.repo', 'sensu.repo', @@ -73,13 +72,7 @@ COPY yum.conf /etc/yum.conf 'zookeeper.repo' ] %} - {% set base_yum_url_packages = [ - 'http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-4.noarch.rpm' - ] %} - {% set base_yum_repo_keys = [ - 'http://yum.mariadb.org/RPM-GPG-KEY-MariaDB', - '/etc/pki/rpm-gpg/RPM-GPG-KEY-Percona', 'https://packages.elastic.co/GPG-KEY-elasticsearch', 'https://repos.influxdata.com/influxdb.key', 'https://packagecloud.io/gpg.key', diff --git a/docker/base/MariaDB.repo b/docker/base/MariaDB.repo deleted file mode 100644 index ddbb1a21d..000000000 --- a/docker/base/MariaDB.repo +++ /dev/null @@ -1,5 +0,0 @@ -[mariadb] -name = MariaDB -baseurl = https://yum.mariadb.org/10.0/centos7-amd64 -gpgkey = https://yum.mariadb.org/RPM-GPG-KEY-MariaDB -gpgcheck = 1 |