Skip to content

Commit 538f94c

Browse files
committed
vstart: add nvmeof_gw to the vstart script
so that it can be later used by the dashboard to configure the nvmeof through UI and create rbd pool in UI Fixes: https://tracker.ceph.com/issues/64201 Signed-off-by: Nizamudeen A <[email protected]>
1 parent 35e40c4 commit 538f94c

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

ceph.spec.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,14 +625,20 @@ Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
625625
Requires: ceph-grafana-dashboards = %{_epoch_prefix}%{version}-%{release}
626626
Requires: ceph-prometheus-alerts = %{_epoch_prefix}%{version}-%{release}
627627
Requires: python%{python3_pkgversion}-setuptools
628+
%if 0%{?fedora} || 0%{?rhel} >= 9
628629
Requires: python%{python3_pkgversion}-grpcio
629630
Requires: python%{python3_pkgversion}-grpcio-tools
631+
%endif
630632
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
631633
Requires: python%{python3_pkgversion}-cherrypy
632634
Requires: python%{python3_pkgversion}-routes
633635
Requires: python%{python3_pkgversion}-werkzeug
634636
%if 0%{?weak_deps}
635637
Recommends: python%{python3_pkgversion}-saml
638+
%if 0%{?fedora} || 0%{?rhel} <= 8
639+
Recommends: python%{python3_pkgversion}-grpcio
640+
Recommends: python%{python3_pkgversion}-grpcio-tools
641+
%endif
636642
%endif
637643
%endif
638644
%if 0%{?suse_version}

src/vstart.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ inc_osd_num=0
206206
msgr="21"
207207

208208
read -r -d '' usage <<EOF || true
209-
usage: $0 [option]... \nex: MON=3 OSD=1 MDS=1 MGR=1 RGW=1 NFS=1 $0 -n -d
209+
usage: $0 [option]... \nex: MON=3 OSD=1 MDS=1 MGR=1 RGW=1 NFS=1 NVMEOF_GW=ceph:5500 $0 -n -d
210210
options:
211211
-d, --debug
212212
-t, --trace
@@ -1302,6 +1302,14 @@ EOF
13021302
debug echo dashboard module not working correctly!
13031303
fi
13041304
fi
1305+
1306+
ceph_adm osd pool create rbd
1307+
ceph_adm osd pool application enable rbd rbd
1308+
1309+
if [ -n "${NVMEOF_GW}" ]; then
1310+
echo "Adding nvmeof-gateway ${NVMEOF_GW} to dashboard"
1311+
ceph_adm dashboard nvmeof-gateway-add -i <(echo "${NVMEOF_GW}") "${NVMEOF_GW/:/_}"
1312+
fi
13051313
fi
13061314
if $with_mgr_restful; then
13071315
create_mgr_restful_secret

0 commit comments

Comments
 (0)