diff options
Diffstat (limited to 'src/cephadm/cephadmlib/daemons/nvmeof.py')
| -rw-r--r-- | src/cephadm/cephadmlib/daemons/nvmeof.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/cephadm/cephadmlib/daemons/nvmeof.py b/src/cephadm/cephadmlib/daemons/nvmeof.py index d916c7e6391..51b085df2a7 100644 --- a/src/cephadm/cephadmlib/daemons/nvmeof.py +++ b/src/cephadm/cephadmlib/daemons/nvmeof.py @@ -8,7 +8,7 @@ from ..container_types import CephContainer from ..context_getters import fetch_configs, get_config_and_keyring from ..daemon_form import register as register_daemon_form from ..daemon_identity import DaemonIdentity -from ceph.cephadm.images import DEFAULT_NVMEOF_IMAGE +from ceph.cephadm.images import DefaultImages from ..context import CephadmContext from ..data_utils import dict_get, is_fsid from ..deployment_utils import to_deployment_container @@ -26,7 +26,7 @@ class CephNvmeof(ContainerDaemonForm): daemon_type = 'nvmeof' required_files = ['ceph-nvmeof.conf'] - default_image = DEFAULT_NVMEOF_IMAGE + default_image = DefaultImages.NVMEOF.image_ref @classmethod def for_daemon_type(cls, daemon_type: str) -> bool: @@ -38,7 +38,7 @@ class CephNvmeof(ContainerDaemonForm): fsid: str, daemon_id: Union[int, str], config_json: Dict, - image: str = DEFAULT_NVMEOF_IMAGE, + image: str = DefaultImages.NVMEOF.image_ref, ) -> None: self.ctx = ctx self.fsid = fsid @@ -100,6 +100,7 @@ class CephNvmeof(ContainerDaemonForm): 'client_cert', 'client_key', 'root_ca_cert', + 'encryption_key', ]: if fn in files: mounts[ |