Merge pull request #102004 from chendave/ceph_rbd

Fix the ceph deploy for e2e testing for ARM64
This commit is contained in:
Kubernetes Prow Robot 2021-05-18 05:53:31 -07:00 committed by GitHub
commit 7ccd90e7d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,3 @@
linux/amd64=fedora:26 linux/amd64=fedora:33
linux/arm64=arm64v8/fedora:26 linux/arm64=arm64v8/fedora:33
linux/ppc64le=ppc64le/fedora:26 linux/ppc64le=ppc64le/fedora:33

View File

@ -21,7 +21,7 @@ FROM $BASEIMAGE
CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/ CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
# Base Packages # Base Packages
RUN yum install -y wget strace psmisc procps-ng ceph ceph-fuse && yum clean all RUN yum install -y wget strace psmisc procps-ng ceph ceph-fuse hostname && yum clean all
# Get ports exposed # Get ports exposed
EXPOSE 6789 EXPOSE 6789

View File

@ -41,6 +41,15 @@ sh ./mds.sh
# Prepare a RBD volume "foo" (only with layering feature, the others may # Prepare a RBD volume "foo" (only with layering feature, the others may
# require newer clients). # require newer clients).
# NOTE: we need Ceph kernel modules on the host that runs the client! # NOTE: we need Ceph kernel modules on the host that runs the client!
# As the default pool `rbd` might not be created on arm64 platform for ceph deployment,
# should create it if it does not exist.
arch=$(uname -m)
if [[ ${arch} = 'aarch64' || ${arch} = 'arm64' ]]; then
if [[ $(ceph osd lspools) = "" ]]; then
ceph osd pool create rbd 8
rbd pool init rbd
fi
fi
rbd import --image-feature layering block foo rbd import --image-feature layering block foo
# Prepare a cephfs volume # Prepare a cephfs volume