diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-28 13:49:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-28 13:49:10 +0000 |
| commit | c2102c4223f3facabf73bc72c40d7b92a4a6a3e4 (patch) | |
| tree | bc94aeb2642dcaa6e90ed38c55e4fdd5c67efd7f | |
| parent | 868b89ea22db0281ff70d9a3014642d5509498df (diff) | |
| parent | f367d2303f3fe22cdd9ce55b20dd77918676ab36 (diff) | |
| download | kolla-c2102c4223f3facabf73bc72c40d7b92a4a6a3e4.tar.gz kolla-c2102c4223f3facabf73bc72c40d7b92a4a6a3e4.zip | |
Merge "CentOS 8: Use upstream Ceph/master" into stable/train
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/base/ceph_master.repo | 32 | ||||
| -rwxr-xr-x | kolla/image/build.py | 7 |
3 files changed, 37 insertions, 7 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 357f1da1f..651f29601 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -233,6 +233,11 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 'centos-release-opstools', 'centos-release-qemu-ev', ] %} +# FIXME(mnasiadka): Replace with CentOS Storage SIG packages when avail +{% else %} +COPY ceph_master.repo /etc/yum.repos.d/ +RUN export CEPH_MASTER_REPO=$(curl -s https://shaman.ceph.com/api/search/\?status\=ready\&project\=ceph\&ref\=master\&flavor\=default\&distros\=centos/8\&sha1\=\latest | awk -F'{|: |,|"|}' '{for(i=1;i<=NF;i++) {gsub(" ",""); if($i == "url") {print $(i+2)}}}') \ + && sed -i "s|CHACRA_URL|${CEPH_MASTER_REPO}|g" /etc/yum.repos.d/ceph_master.repo {% endif %} {% if distro_package_manager == 'dnf' %} diff --git a/docker/base/ceph_master.repo b/docker/base/ceph_master.repo new file mode 100644 index 000000000..1b9296ebc --- /dev/null +++ b/docker/base/ceph_master.repo @@ -0,0 +1,32 @@ +[ceph] +name=Ceph packages for $basearch +baseurl=CHACRA_URL/$basearch +enabled=1 +gpgcheck=0 +type=rpm-md +gpgkey=https://download.ceph.com/keys/autobuild.asc + +[ceph-noarch] +name=Ceph noarch packages +baseurl=CHACRA_URL/noarch +enabled=1 +gpgcheck=0 +type=rpm-md +gpgkey=https://download.ceph.com/keys/autobuild.asc + +[ceph-el8] +name=Copr repo for ceph-el8 owned by ktdreyer +baseurl=https://copr-be.cloud.fedoraproject.org/results/ktdreyer/ceph-el8/epel-8-$basearch/ +type=rpm-md +skip_if_unavailable=True +gpgcheck=1 +gpgkey=https://copr-be.cloud.fedoraproject.org/results/ktdreyer/ceph-el8/pubkey.gpg +repo_gpgcheck=0 +enabled=1 +enabled_metadata=1 + +[ceph-lab-extras] +name=ceph-lab-extras +baseurl=http://apt-mirror.front.sepia.ceph.com/lab-extras/8/ +enabled=1 +gpgcheck=0 diff --git a/kolla/image/build.py b/kolla/image/build.py index 5d25b5b7c..2e5c259e8 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -149,25 +149,19 @@ UNBUILDABLE_IMAGES = { 'centos8': { "almanach-base", # Dropped in master "ceph-base", # Missing Ceph repo - "cinder-base", # Missing Ceph repo "collectd", # Missing collectd-ping and # collectd-sensubility packages "dind", # Dropped in master "dragonflow-base", # Dropped in master "elasticsearch", # Missing elasticsearch repo - "glance-base", # Missing Ceph repo - "gnocchi-base", # Missing Ceph repo "hacluster-base", # Missing hacluster repo "helm-repository", # Dropped in master "kibana", # Missing elasticsearch repo "kube-base", # Dropped in master "kubernetes-entrypoint", # Dropped in master "kubetoolbox", # Dropped in master - "manila-share", # Missing Ceph repo "mongodb", # Missing mongodb and mongodb-server packages "monasca-grafana", # Using python2 - "nova-compute", # Missing Ceph repo - "nova-libvirt", # Missing Ceph repo "nova-spicehtml5proxy", # Missing spicehtml5 package "opendaylight", # Missing opendaylight repo "ovsdpdk", # Not supported on CentOS @@ -180,7 +174,6 @@ UNBUILDABLE_IMAGES = { "cyborg-agent", # opae-sdk does not support CentOS 8 "freezer-base", # Missing package trickle "masakari-monitors", # Missing hacluster repo - "zun-compute", # Missing Ceph repo }, 'debian': { |