openstack/cinder
Code Issues Proposed changes

Use HostAddressOpt for opts that accept IP and hostnames

Browse Source 
Some configuration options were accepting both IP addresses
and hostnames. Since there was no specific OSLO opt type to
support this, we were using ``StrOpt``. The change [1] that
added support for ``HostAddressOpt`` type was merged in Ocata
and became available for use with oslo version 3.22.

This patch changes the opt type of configuration options to use
this more relevant opt type - HostAddressOpt.

[1] I77bdb64b7e6e56ce761d76696bc4448a9bd325eb

Change-Id: Ia5df1e10dbe76040b89b989b8914b2a9b77ad856
This commit is contained in:
luqitao 2017-03-17 01:59:13 -04:00
parent 022fde1fc3
commit 0a7ce3b2d7
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cinder/service.py
View File

@ -67,9 +67,10 @@ service_opts = [
help='Range, in seconds, to randomly delay when starting the'
' periodic task scheduler to reduce stampeding.'
' (Disable by setting to 0)'),
cfg.StrOpt('osapi_volume_listen',
default="0.0.0.0",
help='IP address on which OpenStack Volume API listens'),
cfg.HostAddressOpt('osapi_volume_listen',
default="0.0.0.0",
help='IP address on which OpenStack Volume API '
'listens'),
cfg.PortOpt('osapi_volume_listen_port',
default=8776,
help='Port on which OpenStack Volume API listens'),

14
cinder/volume/driver.py
View File

@ -49,9 +49,10 @@ volume_opts = [
cfg.StrOpt('iscsi_target_prefix',
default='iqn.2010-10.org.openstack:',
help='Prefix for iSCSI volumes'),
cfg.StrOpt('iscsi_ip_address',
default='$my_ip',
help='The IP address that the iSCSI daemon is listening on'),
cfg.HostAddressOpt('iscsi_ip_address',
default='$my_ip',
help='The IP address that the iSCSI daemon is '
'listening on'),
cfg.ListOpt('iscsi_secondary_ip_addresses',
default=[],
help='The list of secondary IP addresses of the iSCSI daemon'),
@ -282,9 +283,10 @@ iser_opts = [
cfg.StrOpt('iser_target_prefix',
default='iqn.2010-10.org.openstack:',
help='Prefix for iSER volumes'),
cfg.StrOpt('iser_ip_address',
default='$my_ip',
help='The IP address that the iSER daemon is listening on'),
cfg.HostAddressOpt('iser_ip_address',
default='$my_ip',
help='The IP address that the iSER daemon is '
'listening on'),
cfg.PortOpt('iser_port',
default=3260,
help='The port that the iSER daemon is listening on'),