import ceph 15.2.15

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

diff --git a/ceph/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh b/ceph/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh
index af7ef81f43f3f5d182288e57e5d7d194aa79bee3..4bad63bc5973c64002e673ddba12a6fc56a06e08 100755 (executable)
--- a/ceph/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh
+++ b/ceph/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh
@@ -10,6 +10,15 @@ mon_ip=$(ifconfig eth0  | grep 'inet ' | awk '{ print $2}')
 
 cephadm bootstrap --mon-ip $mon_ip --initial-dashboard-password {{ admin_password }} --allow-fqdn-hostname --dashboard-password-noupdate --shared_ceph_folder /mnt/{{ ceph_dev_folder }}
 
+fsid=$(cat /etc/ceph/ceph.conf | grep fsid | awk '{ print $3}')
+
 {% for number in range(1, nodes) %}
   ssh-copy-id -f -i /etc/ceph/ceph.pub  -o StrictHostKeyChecking=no root@{{ prefix }}-node-0{{ number }}.{{ domain }}
+  {% if expanded_cluster is defined %}
+    cephadm shell --fsid $fsid -c /etc/ceph/ceph.conf -k /etc/ceph/ceph.client.admin.keyring ceph orch host add {{ prefix }}-node-0{{ number }}.{{ domain }}
+  {% endif %}
 {% endfor %}
+
+{% if expanded_cluster is defined %}
+  cephadm shell --fsid $fsid -c /etc/ceph/ceph.conf -k /etc/ceph/ceph.client.admin.keyring ceph orch apply osd --all-available-devices
+{% endif %}