From: Alfonso Martínez <almartin@redhat.com>
Date: Fri, 19 Nov 2021 07:57:06 +0000 (+0100)
Subject: mgr/dashboard: cephadm e2e start script: deploy monitoring stack when --expanded
X-Git-Tag: v17.1.0~375^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F44023%2Fhead;p=ceph.git

mgr/dashboard: cephadm e2e start script: deploy monitoring stack when --expanded

Fixes: https://tracker.ceph.com/issues/53333
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh b/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh
index 2c451f7864c1..439b8e9abe0a 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"