import ceph quincy 17.2.4

[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 a0e997587259d70679adeab1b98c65038a4e2b89..5a3fa4349c37144104887ed0e676199fe5ae82d4 100755 (executable)
--- a/ceph/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh
+++ b/ceph/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh
@@ -11,10 +11,13 @@ mkdir -p /etc/ceph
 mon_ip=$(ifconfig eth0  | grep 'inet ' | awk '{ print $2}')
 
 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 %}
+
+# commenting the below lines. Uncomment it when any extra options are
+# needed for the bootstrap.
+# bootstrap_extra_options_not_expanded=''
+# {% 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}