mgr/dashboard: fix bootstrap script for cephadm installation

Signed-off-by: avanthakkar <avanjohn@gmail.com>
ceph · Sep 13, 2023 · 30eabab · 30eabab
1 parent 2bc9a17
commit 30eabab
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh b/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh
@@ -1,15 +1,18 @@
 #!/usr/bin/env bash
 
-set -x
+set -ex
 
 export PATH=/root/bin:$PATH
 mkdir /root/bin
 
 export CEPHADM_IMAGE='quay.ceph.io/ceph-ci/ceph:main'
 
 CEPHADM="/root/bin/cephadm"
+CEPHADM_SRC="/mnt/{{ ceph_dev_folder }}/src/cephadm/cephadm"
+
+/mnt/{{ ceph_dev_folder }}/src/cephadm/build.sh $CEPHADM_SRC
+ln -s $CEPHADM_SRC $CEPHADM
 
-/mnt/{{ ceph_dev_folder }}/src/cephadm/build.sh $CEPHADM
 mkdir -p /etc/ceph
 mon_ip=$(ifconfig eth0  | grep 'inet ' | awk '{ print $2}')
 
@@ -22,7 +25,7 @@ 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} --no-cleanup-on-failure
 
 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"