From 09c8d1a3b411571766175e986e076d3e2c941b2b Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Mon, 6 Dec 2021 14:58:14 -0700 Subject: [PATCH] behave_test: compile cephadm build the compiled cephadm binary during the behave test Signed-off-by: Michael Fritch Signed-off-by: John Mulligan --- .../template/bootstrap_script_template | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/test/behave_tests/template/bootstrap_script_template b/src/test/behave_tests/template/bootstrap_script_template index de2d6b24f1a04..de2129e76c8d9 100644 --- a/src/test/behave_tests/template/bootstrap_script_template +++ b/src/test/behave_tests/template/bootstrap_script_template @@ -1,28 +1,30 @@ export PATH=/root/bin:$PATH mkdir /root/bin + +CEPHADM="/root/bin/cephadm" + {% raw %} {% if ceph_dev_folder is defined %} - cp /mnt/{{ ceph_dev_folder }}/src/cephadm/cephadm /root/bin/cephadm + /mnt/{{ ceph_dev_folder }}/src/cephadm/build.sh $CEPHADM {% else %} - cd /root/bin - curl --silent --remote-name --location https://raw.githubusercontent.com/ceph/ceph/master/src/cephadm/cephadm + curl --silent -o $CEPHADM --location https://raw.githubusercontent.com/ceph/ceph/main/src/cephadm/cephadm.py {% endif %} -chmod +x /root/bin/cephadm +chmod +x $CEPHADM mkdir -p /etc/ceph mon_ip=$(ifconfig eth0 | grep 'inet ' | awk '{ print $2}') {% if ceph_dev_folder is defined %} echo "ceph_dev_folder is defined" - cephadm bootstrap --mon-ip $mon_ip --initial-dashboard-password {{ admin_password }} --allow-fqdn-hostname --dashboard-password-noupdate --shared_ceph_folder /mnt/{{ ceph_dev_folder }} + $CEPHADM bootstrap --mon-ip $mon_ip --initial-dashboard-password {{ admin_password }} --allow-fqdn-hostname --dashboard-password-noupdate --shared_ceph_folder /mnt/{{ ceph_dev_folder }} {% else %} echo "ceph_dev_folder is not defined" - cephadm bootstrap --mon-ip $mon_ip --initial-dashboard-password {{ admin_password }} --allow-fqdn-hostname --dashboard-password-noupdate + $CEPHADM bootstrap --mon-ip $mon_ip --initial-dashboard-password {{ admin_password }} --allow-fqdn-hostname --dashboard-password-noupdate {% endif %} 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 }} - 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 }} + $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 }} {% endfor %} {% endraw %} {% if configure_osd %} -cephadm shell --fsid $fsid -c /etc/ceph/ceph.conf -k /etc/ceph/ceph.client.admin.keyring ceph orch apply osd --all-available-devices -{% endif %} \ No newline at end of file +$CEPHADM shell --fsid $fsid -c /etc/ceph/ceph.conf -k /etc/ceph/ceph.client.admin.keyring ceph orch apply osd --all-available-devices +{% endif %} -- 2.39.5