diff options
| author | Zuul <zuul@review.opendev.org> | 2020-06-04 10:56:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-06-04 10:56:22 +0000 |
| commit | 05acbd2c459bf70d63ea53a3625bc96b0d9e7626 (patch) | |
| tree | e90e1db7349247d908f3a64ba4cab0e124a54eb8 /docker | |
| parent | fa5abde6c60c92b6996f051095a0a9cbd08d8227 (diff) | |
| parent | e37e876c82a668f763a8a9261c36f7c8a0f6b85f (diff) | |
| download | kolla-05acbd2c459bf70d63ea53a3625bc96b0d9e7626.tar.gz kolla-05acbd2c459bf70d63ea53a3625bc96b0d9e7626.zip | |
Merge "Use CentOS official mirrors for Ceph packages"
Diffstat (limited to 'docker')
| -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 |