From 6c7688ca5b38643bb1645147936d8f3b9f347f0a Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Tue, 16 Aug 2022 19:47:13 +0530 Subject: [PATCH] mgr/dashboard: fix "can't read .ssh/known_hosts: No such file or directory" Updates the fedora version too Fixes: https://tracker.ceph.com/issues/57365 Signed-off-by: Nizamudeen A --- src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh | 2 +- src/pybind/mgr/dashboard/ci/cephadm/ceph_cluster.yml | 2 +- src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh b/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh index 5a3fa4349c3..bd36644ec4f 100755 --- a/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh +++ b/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh @@ -25,7 +25,7 @@ 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" {% for number in range(1, nodes) %} - ssh-copy-id -f -i /etc/ceph/ceph.pub -o StrictHostKeyChecking=no root@{{ prefix }}-node-0{{ number }} + ssh-copy-id -f -i /etc/ceph/ceph.pub -o StrictHostKeyChecking=no root@192.168.100.10{{ number }} {% if expanded_cluster is defined %} ${cephadm_shell} ceph orch host add {{ prefix }}-node-0{{ number }} {% endif %} diff --git a/src/pybind/mgr/dashboard/ci/cephadm/ceph_cluster.yml b/src/pybind/mgr/dashboard/ci/cephadm/ceph_cluster.yml index 5d9f0723d58..a334fbad5f6 100755 --- a/src/pybind/mgr/dashboard/ci/cephadm/ceph_cluster.yml +++ b/src/pybind/mgr/dashboard/ci/cephadm/ceph_cluster.yml @@ -8,7 +8,7 @@ parameters: prefix: ceph numcpus: 1 memory: 2048 - image: fedora34 + image: fedora36 notify: false admin_password: password disks: diff --git a/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh b/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh index 95cfd070d8c..e3434d72a4f 100755 --- a/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh +++ b/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh @@ -41,7 +41,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 +71,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://fedora.mirror.liteserver.nl/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 \ -- 2.39.5