From 081e45cbcffc2dfc49cf572bb2608b806f4473a0 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Fri, 19 Nov 2021 13:24:58 -0700 Subject: [PATCH] mgr/dashboard: compile cephadm build the compiled cephadm binary during the e2e test Signed-off-by: Michael Fritch --- src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh b/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh index bd36644ec4f..67a0fba2296 100755 --- a/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh +++ b/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh @@ -5,8 +5,9 @@ set -x export PATH=/root/bin:$PATH mkdir /root/bin -cp /mnt/{{ ceph_dev_folder }}/src/cephadm/cephadm /root/bin/cephadm -chmod +x /root/bin/cephadm +CEPHADM="/root/bin/cephadm" + +/mnt/{{ ceph_dev_folder }}/src/cephadm/build.sh $CEPHADM mkdir -p /etc/ceph mon_ip=$(ifconfig eth0 | grep 'inet ' | awk '{ print $2}') @@ -19,10 +20,10 @@ bootstrap_extra_options='--allow-fqdn-hostname --dashboard-password-noupdate' # bootstrap_extra_options+=" ${bootstrap_extra_options_not_expanded}" # {% endif %} -cephadm bootstrap --mon-ip $mon_ip --initial-dashboard-password {{ admin_password }} --shared_ceph_folder /mnt/{{ ceph_dev_folder }} ${bootstrap_extra_options} +$CEPHADM bootstrap --mon-ip $mon_ip --initial-dashboard-password {{ admin_password }} --shared_ceph_folder /mnt/{{ ceph_dev_folder }} ${bootstrap_extra_options} fsid=$(cat /etc/ceph/ceph.conf | grep fsid | awk '{ print $3}') -cephadm_shell="cephadm shell --fsid ${fsid} -c /etc/ceph/ceph.conf -k /etc/ceph/ceph.client.admin.keyring" +cephadm_shell="$CEPHADM shell --fsid ${fsid} -c /etc/ceph/ceph.conf -k /etc/ceph/ceph.client.admin.keyring" {% for number in range(1, nodes) %} ssh-copy-id -f -i /etc/ceph/ceph.pub -o StrictHostKeyChecking=no root@192.168.100.10{{ number }} -- 2.39.5