From 5f40f534b5804a37f5742fdc5011be51dcc65dd6 Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Mon, 29 May 2017 19:22:03 -0400 Subject: [PATCH] Revert "Use HostAddressOpt for opts that accept IP and hostnames" This causes a compat problem for config files that were using IPv6 addresses formatted with brackets. Closes-Bug: #1697997 This reverts commit 0a7ce3b2d77b4685cc293a39984805d12d3fd24a. Change-Id: I85aa2754b3cc37f65769e4958290f27e85f74f81 --- cinder/service.py | 7 +++---- cinder/volume/driver.py | 14 ++++++-------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/cinder/service.py b/cinder/service.py index 8280cac5cd4..e805021fc84 100644 --- a/cinder/service.py +++ b/cinder/service.py @@ -67,10 +67,9 @@ service_opts = [ help='Range, in seconds, to randomly delay when starting the' ' periodic task scheduler to reduce stampeding.' ' (Disable by setting to 0)'), - cfg.HostAddressOpt('osapi_volume_listen', - default="0.0.0.0", - help='IP address on which OpenStack Volume API ' - 'listens'), + cfg.StrOpt('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'), diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py index e3694cc3900..5dec26d8378 100644 --- a/cinder/volume/driver.py +++ b/cinder/volume/driver.py @@ -49,10 +49,9 @@ volume_opts = [ cfg.StrOpt('iscsi_target_prefix', default='iqn.2010-10.org.openstack:', help='Prefix for iSCSI volumes'), - cfg.HostAddressOpt('iscsi_ip_address', - default='$my_ip', - help='The IP address that the iSCSI daemon is ' - 'listening on'), + cfg.StrOpt('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'), @@ -283,10 +282,9 @@ iser_opts = [ cfg.StrOpt('iser_target_prefix', default='iqn.2010-10.org.openstack:', help='Prefix for iSER volumes'), - cfg.HostAddressOpt('iser_ip_address', - default='$my_ip', - help='The IP address that the iSER daemon is ' - 'listening on'), + cfg.StrOpt('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'),