import ceph quincy 17.2.6

[ceph.git] / ceph / src / pybind / mgr / dashboard / ci / cephadm / start-cluster.sh

diff --git a/ceph/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh b/ceph/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
index 26fbd8a7c4b699f194280d2075e845ad203430c3..e86cec82bc9cef02d30c377fa9ea30b5391d6e35 100755 (executable)
--- a/ceph/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
+++ b/ceph/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
@@ -8,6 +8,8 @@ cleanup() {
         echo "Starting cleanup..."
         kcli delete plan -y ceph || true
         kcli delete network ceph-dashboard -y
+        kcli delete pool ceph-dashboard -y
+        rm -rf ${HOME}/.kcli
         docker container prune -f
         echo "Cleanup completed."
     fi
@@ -41,7 +43,7 @@ on_error() {
 trap 'on_error $? $LINENO' ERR
 trap 'cleanup $? $LINENO' EXIT
 
-sed -i '/ceph-node-/d' $HOME/.ssh/known_hosts
+sed -i '/ceph-node-/d' $HOME/.ssh/known_hosts || true
 
 : ${CEPH_DEV_FOLDER:=${PWD}}
 EXTRA_PARAMS=''
@@ -71,8 +73,8 @@ fi
 npm run build ${FRONTEND_BUILD_OPTS} &
 
 cd ${CEPH_DEV_FOLDER}
-: ${VM_IMAGE:='fedora34'}
-: ${VM_IMAGE_URL:='https://fedora.mirror.liteserver.nl/linux/releases/34/Cloud/x86_64/images/Fedora-Cloud-Base-34-1.2.x86_64.qcow2'}
+: ${VM_IMAGE:='fedora36'}
+: ${VM_IMAGE_URL:='https://download.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-1.5.x86_64.qcow2'}
 kcli download image -p ceph-dashboard -u ${VM_IMAGE_URL} ${VM_IMAGE}
 kcli delete plan -y ceph || true
 kcli create plan -f src/pybind/mgr/dashboard/ci/cephadm/ceph_cluster.yml \