From e4f03075940e0fd9d2b89d266b08608809a86193 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alfonso=20Mart=C3=ADnez?= Date: Fri, 19 Nov 2021 08:57:06 +0100 Subject: [PATCH] mgr/dashboard: cephadm e2e start script: deploy monitoring stack when --expanded MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes: https://tracker.ceph.com/issues/53333 Signed-off-by: Alfonso Martínez --- src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh b/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh index 2c451f7864c..439b8e9abe0 100755 --- a/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh +++ b/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh @@ -8,7 +8,13 @@ chmod +x /root/bin/cephadm mkdir -p /etc/ceph mon_ip=$(ifconfig eth0 | grep 'inet ' | awk '{ print $2}') -cephadm bootstrap --mon-ip $mon_ip --initial-dashboard-password {{ admin_password }} --allow-fqdn-hostname --skip-monitoring-stack --dashboard-password-noupdate --shared_ceph_folder /mnt/{{ ceph_dev_folder }} +bootstrap_extra_options='--allow-fqdn-hostname --dashboard-password-noupdate' +bootstrap_extra_options_not_expanded='--skip-monitoring-stack' +{% if expanded_cluster is not defined %} + 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} 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" -- 2.39.5