diff options
| author | Alfredo Moralejo <amoralej@redhat.com> | 2020-06-02 11:20:09 +0200 |
|---|---|---|
| committer | Alfredo Moralejo <amoralej@redhat.com> | 2020-06-02 15:45:04 +0200 |
| commit | e37e876c82a668f763a8a9261c36f7c8a0f6b85f (patch) | |
| tree | cbe2889381e24a84d16ec1c934957de15f1336fd | |
| parent | 83ef520d640783b7745368ab1654aec59afa6461 (diff) | |
| download | kolla-e37e876c82a668f763a8a9261c36f7c8a0f6b85f.tar.gz kolla-e37e876c82a668f763a8a9261c36f7c8a0f6b85f.zip | |
Use CentOS official mirrors for Ceph packages
It's still using temporary mirror in RDO infra, but now that packages
are properly synced to CentOS mirrors, let's switch to use it.
Change-Id: I913efffe6a1d8a0210b1158261c77d0d45ac3147
| -rw-r--r-- | docker/base/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | docker/base/ceph.repo | 13 |
2 files changed, 2 insertions, 21 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 84e5cf188..4d6c908a9 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -188,23 +188,18 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial {% 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-Storage', ] %} # 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', # {% set base_centos_yum_repo_packages = [ 'centos-release-opstools', + 'centos-release-ceph-nautilus', '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' {% 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 = [ 'centos-ceph-nautilus', - 'centos-nfs-ganesha28', 'centos-opstools', 'centos-rabbitmq-38', ] %} diff --git a/docker/base/ceph.repo b/docker/base/ceph.repo deleted file mode 100644 index dd0be5430..000000000 --- a/docker/base/ceph.repo +++ /dev/null @@ -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 |