openstack/kolla
Code Issues Proposed changes

Merge "Use CentOS official mirrors for Ceph packages"

Browse Source
This commit is contained in:
Zuul 2020-06-04 10:56:22 +00:00 committed by Gerrit Code Review
commit 05acbd2c45
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/base/Dockerfile.j2
View File

@ -188,23 +188,18 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
{% set base_centos_yum_repo_keys = [ {% set base_centos_yum_repo_keys = [
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools', '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
] %} ] %}
# FIXME(mgoddard): Not available for CentOS 8 yet. # FIXME(mgoddard): Not available for CentOS 8 yet.
# #
# '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
# '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization', # '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
# #
{% set base_centos_yum_repo_packages = [ {% set base_centos_yum_repo_packages = [
'centos-release-opstools', 'centos-release-opstools',
'centos-release-ceph-nautilus',
'epel-release', 'epel-release',
] %} ] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
#
# 'centos-release-ceph-nautilus',
#
# FIXME(mnasiadka): Replace with CentOS Storage SIG packages when avail
COPY ceph.repo /etc/yum.repos.d/
# We need 'dnf-plugins-core' for 'dnf config-manager' # We need 'dnf-plugins-core' for 'dnf config-manager'
{% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [ {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
@ -216,7 +211,6 @@ COPY ceph.repo /etc/yum.repos.d/
{% set base_centos_yum_repos_to_disable = [ {% set base_centos_yum_repos_to_disable = [
'centos-ceph-nautilus', 'centos-ceph-nautilus',
'centos-nfs-ganesha28',
'centos-opstools', 'centos-opstools',
'centos-rabbitmq-38', 'centos-rabbitmq-38',
] %} ] %}

13
docker/base/ceph.repo
View File

@ -1,13 +0,0 @@
[centos-ceph-nautilus]
name=Ceph packages for $basearch
baseurl=https://trunk.rdoproject.org/centos8-master/deps/storage/storage8-ceph-nautilus/$basearch/
enabled=0
gpgcheck=0
type=rpm-md
[centos-nfs-ganesha28]
name=Ganesha packages for $basearch
baseurl=https://trunk.rdoproject.org/centos8-master/deps/storage/storage8-nfsganesha-28/$basearch/
enabled=0
gpgcheck=0
type=rpm-md