diff options
Diffstat (limited to 'cinder/volume/driver.py')
| -rw-r--r-- | cinder/volume/driver.py | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py index 96c76faed..f623a39a0 100644 --- a/cinder/volume/driver.py +++ b/cinder/volume/driver.py @@ -57,7 +57,8 @@ volume_opts = [ default='$my_ip', help='The IP address that the iSCSI/NVMEoF daemon is ' 'listening on'), - cfg.ListOpt('iscsi_secondary_ip_addresses', + cfg.ListOpt('target_secondary_ip_addresses', + deprecated_name='iscsi_secondary_ip_addresses', default=[], help='The list of secondary IP addresses of the ' 'iSCSI/NVMEoF daemon'), @@ -263,14 +264,27 @@ iser_opts = [ help='The name of the iSER target user-land tool to use'), ] +nvmeof_opts = [ + cfg.IntOpt('nvmeof_conn_info_version', + default=1, + min=1, max=2, + help='NVMe os-brick connector has 2 different connection info ' + 'formats, this allows some NVMe-oF drivers that use the ' + 'original format (version 1), such as spdk and LVM-nvmet, ' + 'to send the newer format.'), +] + nvmet_opts = [ cfg.PortOpt('nvmet_port_id', default=1, - help='The port that the NVMe target is listening on.'), + help='The id of the NVMe target port definition when not ' + 'sharing targets. The starting port id value when ' + 'sharing, incremented for each secondary ip address.'), cfg.IntOpt('nvmet_ns_id', default=10, - help='The namespace id associated with the subsystem ' - 'that will be created with the path for the LVM volume.'), + help='Namespace id for the subsystem for the LVM volume when ' + 'not sharing targets. The minimum id value when sharing.' + 'Maximum supported value in Linux is 8192') ] scst_opts = [ @@ -348,11 +362,13 @@ fqdn_opts = [ CONF = cfg.CONF CONF.register_opts(volume_opts, group=configuration.SHARED_CONF_GROUP) CONF.register_opts(iser_opts, group=configuration.SHARED_CONF_GROUP) +CONF.register_opts(nvmeof_opts, group=configuration.SHARED_CONF_GROUP) CONF.register_opts(nvmet_opts, group=configuration.SHARED_CONF_GROUP) CONF.register_opts(scst_opts, group=configuration.SHARED_CONF_GROUP) CONF.register_opts(image_opts, group=configuration.SHARED_CONF_GROUP) CONF.register_opts(volume_opts) CONF.register_opts(iser_opts) +CONF.register_opts(nvmeof_opts) CONF.register_opts(nvmet_opts) CONF.register_opts(scst_opts) CONF.register_opts(backup_opts) @@ -414,6 +430,7 @@ class BaseVD(object, metaclass=abc.ABCMeta): if self.configuration: self.configuration.append_config_values(volume_opts) self.configuration.append_config_values(iser_opts) + self.configuration.append_config_values(nvmeof_opts) self.configuration.append_config_values(nvmet_opts) self.configuration.append_config_values(scst_opts) self.configuration.append_config_values(backup_opts) |