Skip to content

Commit f6887b8

Browse files
authored
Merge pull request ceph#60991 from ShwetaBhosale1/fix_issue_69153_nfs_to_show_ingress_mode
mgr/nfs: Show ingress mode in output of 'ceph nfs cluster info' command Reviewed-by: Adam King <[email protected]>
2 parents 9c2dec2 + c3da911 commit f6887b8

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/pybind/mgr/nfs/cluster.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,14 @@ def _show_nfs_cluster_info(self, cluster_id: str) -> Dict[str, Any]:
236236
r['port'] = i.ports[0]
237237
if len(i.ports) > 1:
238238
r['monitor_port'] = i.ports[1]
239+
if spec.keepalive_only:
240+
ingress_mode = IngressType.keepalive_only
241+
elif spec.enable_haproxy_protocol:
242+
ingress_mode = IngressType.haproxy_protocol
243+
else:
244+
ingress_mode = IngressType.haproxy_standard
245+
r['ingress_mode'] = ingress_mode.value
246+
239247
log.debug("Successfully fetched %s info: %s", cluster_id, r)
240248
return r
241249

0 commit comments

Comments
 (0)