From aca468240f7f5edca61988dac51f515e913e3a85 Mon Sep 17 00:00:00 2001 From: Gil Bregman Date: Mon, 25 Nov 2024 10:35:24 +0200 Subject: [PATCH] mgr/cephadm: Add key encryption support to nvmeof configuration Fixes https://tracker.ceph.com/issues/69036 Signed-off-by: Gil Bregman --- .../mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 | 1 + src/pybind/mgr/cephadm/tests/test_services.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 b/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 index fed2a1be82b..73f36952ee7 100644 --- a/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 +++ b/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 @@ -8,6 +8,7 @@ enable_auth = {{ spec.enable_auth }} state_update_notify = {{ spec.state_update_notify }} state_update_interval_sec = {{ spec.state_update_interval_sec }} enable_spdk_discovery_controller = {{ spec.enable_spdk_discovery_controller }} +enable_key_encryption = {{ spec.enable_key_encryption }} enable_prometheus_exporter = {{ spec.enable_prometheus_exporter }} prometheus_exporter_ssl = False prometheus_port = 10008 diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py index 83da1fa4232..75c7c3c5bf7 100644 --- a/src/pybind/mgr/cephadm/tests/test_services.py +++ b/src/pybind/mgr/cephadm/tests/test_services.py @@ -398,6 +398,7 @@ enable_auth = False state_update_notify = True state_update_interval_sec = 5 enable_spdk_discovery_controller = False +enable_key_encryption = True enable_prometheus_exporter = True prometheus_exporter_ssl = False prometheus_port = 10008 @@ -410,7 +411,7 @@ allowed_consecutive_spdk_ping_failures = 1 spdk_ping_interval_in_seconds = 2.0 ping_spdk_under_lock = False enable_monitor_client = True -max_hosts_per_namespace = 1 +max_hosts_per_namespace = 8 max_namespaces_with_netmask = 1000 max_subsystems = 128 max_namespaces = 1024 -- 2.39.5